diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-11-02 16:36:33 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-11-02 16:36:33 -0800 |
commit | 7ff866eb1b8769780924ba2b555d2ec534919fbf (patch) | |
tree | 21eaf1d5b10748fd28d3ff74bebf52c573417ed6 /daemon.c | |
parent | 0eb5ebc1d862737ea2b313d0d77d120b3d114099 (diff) | |
parent | 4c1360f472ca5706a3dd1eed0b88603cb05d0827 (diff) | |
download | git-7ff866eb1b8769780924ba2b555d2ec534919fbf.tar.gz git-7ff866eb1b8769780924ba2b555d2ec534919fbf.tar.xz |
Merge branch 'sh/rebase-i-p'
* sh/rebase-i-p:
git-rebase--interactive.sh: comparision with == is bashism
rebase-i-p: minimum fix to obvious issues
rebase-i-p: if todo was reordered use HEAD as the rewritten parent
rebase-i-p: do not include non-first-parent commits touching UPSTREAM
rebase-i-p: only list commits that require rewriting in todo
rebase-i-p: fix 'no squashing merges' tripping up non-merges
rebase-i-p: delay saving current-commit to REWRITTEN if squashing
rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEAD
rebase-i-p: test to exclude commits from todo based on its parents
Diffstat (limited to 'daemon.c')
0 files changed, 0 insertions, 0 deletions