projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e1bc8dc f09c9b8)
Merge branch 'js/rebase'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Jul 2007 08:45:47 +0000 (01:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Jul 2007 08:45:47 +0000 (01:45 -0700)
commitf36db549057f09dd390d712fa2d72dd2599feba6
tree3f58a55fe4761614cf358090cd57ac5037302fd0tree | snapshot
parente1bc8dc66dd5a2ef8b23c6b7cac8164d85e73307commit | diff
parentf09c9b8c5ff9d8a15499b09ccd6c3e7b3c76af77commit | diff
Merge branch 'js/rebase'

* js/rebase:
  Teach rebase -i about --preserve-merges
  rebase -i: provide reasonable reflog for the rebased branch
  rebase -i: several cleanups
  ignore git-rebase--interactive
  Teach rebase an interactive mode
  Move the pick_author code to git-sh-setup
Makefile diff1 | diff2 | blob | history
git-sh-setup.sh diff1 | diff2 | blob | history
Git—the stupid content tracker