summaryrefslogtreecommitdiff
path: root/Documentation/howto
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-28 06:53:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-29 19:52:02 (GMT)
commit48313592bf318139b39d6017a863f27420e3939a (patch)
tree10b79491f79ce17c773e37311a01697050cf2383 /Documentation/howto
parent2c04662d89eaa55cecb6effd743c17051d1458ec (diff)
downloadgit-48313592bf318139b39d6017a863f27420e3939a.zip
git-48313592bf318139b39d6017a863f27420e3939a.tar.gz
git-48313592bf318139b39d6017a863f27420e3939a.tar.bz2
Redo "revert" using three-way merge machinery.
The reverse patch application using "git apply" sometimes is too rigid. Since the user would get used to resolving conflicting merges by hand during the normal merge experience, using the same machinery would be more helpful rather than just giving up. Cherry-picking and reverting are essentially the same operation. You pick one commit, and apply the difference that commit introduces to its own commit ancestry chain to the current tree. Revert applies the diff in reverse while cherry-pick applies it forward. They share the same logic, just different messages and merge direction. Rewrite "git rebase" using "git cherry-pick". Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/howto')
0 files changed, 0 insertions, 0 deletions