Comments (4)
Hi Olivier, Is it possible to do a --no-ff merge?
from gitup.
Automatically when pulling, no. Manually, yes. Fetch the remote, select its tip in the Map view, then explicitly merge with the local branch with m
.
from gitup.
Thanks Olivier!, I'm gonna try that one
from gitup.
Is this issue under consideration? I'm very curious as to how I can merge a feature branch into master with just one commit being created in master with a message of my choosing. Is this the same thing as squashing commits? Currently if I merge feature into master I get every commit from feature in master upon merge.
Thanks
from gitup.
Related Issues (20)
- Saving credentials for https or using macOS keychain not working? HOT 3
- Ability to delete a currently selected local HEAD branch
- Prune local branches for which no remote branch exists anymore HOT 1
- Ability to go back if merge has been cancelled accidentally
- Cherry-pick a group of commits onto another branch
- VirusTotal marked installer as malicious HOT 2
- GitUpKit ssh credentials callback does not handle username correctly if it is defined in ssh config
- Bug: Impossible to clone another repo when a merge with conflicts is in progress
- Diff files not in a git repository? HOT 1
- Select Box for View Menu Is Bad UI/UX HOT 1
- New icon or error? HOT 1
- The way to revert application icons to the previous version's scheme HOT 2
- What 🚫 stands for in gitup file comparison view? HOT 1
- Are the Brew install instructions out of date? HOT 3
- Search field delete/backspace should not carry through to deleting commits HOT 1
- Option to open repository as a new tab in the current window HOT 2
- HPLC uv spectrometer project
- Error "the index is locked; this might be due to a concurrent or crashed process"
- Regular crashes observed HOT 3
- práctica2.txt
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from gitup.