diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2009-09-05 11:30:10 -0400 |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2009-09-05 11:37:12 -0400 |
| commit | 71dc277bfcd7b98b1f71d46da59f5cd2da3e3974 (patch) | |
| tree | 2a23c9d36b4db6c49f8a803b01d12a1028fb6e14 /TODO | |
| parent | 8d338f0ea9667698fcd975bf52fb9633971699da (diff) | |
Make 'git bz add-url' more like git rebase
Instead of resetting the branch and applying the patches there,
move to a detached HEAD, apply patches to the detached HEAD and
then make a single update to the branch ref.
The only real advantage of this is that 'git reflog show <branchname>'
shows a single meaningful commit.
Diffstat (limited to 'TODO')
| -rw-r--r-- | TODO | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -70,19 +70,12 @@ Pass --3way to git-am Make -u/--add-url kinder on the reflog - -u works by resetting, then on each patch, running git cherry-pick - followed by git commit --amend. It would be nice to only have one - (informative) reflog entry for the entire process, or at least avoid - the double commits. + -u works each patch, running git cherry-pick followed by + git commit --amend. It would be nice to only avoid the double + commits. The double commits could be avoided if if we did the 'rewrite patch' thing for 'git bz apply'- then we could use it here too and just pass the whole sequence to 'git am'. And by setting GIT_REFLOG_ACTION='bz add-url' it should work almost perfectly. - It wouldn't give a single reflog entry, but 'git rebase' and - 'git am' don't show up as a single entry either. 'git rebase' - does show up as a single entry in 'git reflog show master'; that's - done by detaching from the branch during the operation. We could - do that as well. - |