Comments (4)
Never heard of ORIG_HEAD before - now that I've done a bit of Googling, I'm not sure I follow. ORIG_HEAD is set by pull
and merge
before they do their thing, according to this Stack Overflow answer.
Are you saying git-up should behave similarly and set ORIG_HEAD before it does anything, and if so, what does that have to do with preserving merges?
from git-up.
Sorry for not explaining properly. But first: one uses ORIG_HEAD after git pull/merge to see which changes have been fetched from the server in the git pull/merge, for example like this:
git log ORIG_HEAD..
As it is, git-up already behaves properly with regards to ORIG_HEAD.
Now to the issue at hand. When doing a regular rebase, any unpushed merge commits will be "flattened out". The rebase command has a --preserve-merges option which preserve merge commits when rebasing. The problem with this option is that it sets ORIG_HEAD incorrectly (look at the "Downsides to git rebase -p" section).
So if you could add an option to git-up that preserves merges it would be great! An greater still if you could point ORIG_HEAD to the correct commit afterwards.
from git-up.
OK. So merges can currently be preserved by setting git-up.rebase.arguments
to --preserve-merges
. Perhaps we should always set ORIG_HEAD to whatever HEAD was at the time git-up
was run. Does that sound sensible, and would you be happy to implement it?
from git-up.
Closing due to quiet - if someone wants to implement and PR this, be my guest.
from git-up.
Related Issues (20)
- UX Improvement: Show SHA for commits (Map + Commit view) HOT 1
- [Enhancement] wiki page for merge conflicts resolution FAQ
- git-up fails when origin url is using https instead of ssh
- git up --help doesn't behave as expected
- Add a setting that would try "origin master" if there's no tracking information
- A nasty backtrace when trying to stash even though there are unmerged changes HOT 2
- git up fails when upstream branch is deleted HOT 4
- git up and stashed changes
- Does not work on OS X 10.11 HOT 3
- fails when run in a submodule folder HOT 2
- Ruby error on running git-up HOT 1
- merge upstream fork as well? HOT 1
- git-up really slow...need help to debug HOT 2
- Could not fetch origin: error: Ref refs/remotes/origin/master is at X but expected Y HOT 2
- Special shell symbols such as & aren't handled properly
- Please explain how git solves the current problem? HOT 16
- pull --rebase --autostash does NOT the same thing HOT 5
- ERROR: While executing gem ... (Gem::FilePermissionError) on OS X El Capitan HOT 3
- report merge conflicts on stash pop
- Git 2.5 - Multiple worktrees support HOT 1
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 git-up.