summaryrefslogtreecommitdiff
path: root/Documentation/git-convert-cache.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-08-27 23:53:27 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-08-29 12:52:02 -0700
commit48313592bf318139b39d6017a863f27420e3939a (patch)
tree10b79491f79ce17c773e37311a01697050cf2383 /Documentation/git-convert-cache.txt
parentRevert "Replace zero-length array decls with []." (diff)
downloadtgif-48313592bf318139b39d6017a863f27420e3939a.tar.xz
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/git-convert-cache.txt')
0 files changed, 0 insertions, 0 deletions