summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2008-11-02Merge branch 'sh/rebase-i-p'Libravatar Junio C Hamano1-49/+83
2008-10-22git-rebase--interactive.sh: comparision with == is bashismLibravatar Junio C Hamano1-1/+1
2008-10-20rebase-i-p: minimum fix to obvious issuesLibravatar Junio C Hamano1-3/+4
2008-10-19Merge branch 'sh/maint-rebase3'Libravatar Junio C Hamano1-2/+35
2008-10-19Merge branch 'ns/rebase-noverify'Libravatar Junio C Hamano1-1/+9
2008-10-16rebase-i-p: if todo was reordered use HEAD as the rewritten parentLibravatar Stephen Haberman1-0/+9
2008-10-16rebase-i-p: do not include non-first-parent commits touching UPSTREAMLibravatar Stephen Haberman1-1/+2
2008-10-16rebase-i-p: only list commits that require rewriting in todoLibravatar Stephen Haberman1-25/+52
2008-10-16rebase-i-p: fix 'no squashing merges' tripping up non-mergesLibravatar Stephen Haberman1-5/+9
2008-10-16rebase-i-p: delay saving current-commit to REWRITTEN if squashingLibravatar Stephen Haberman1-5/+10
2008-10-16rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEADLibravatar Stephen Haberman1-14/+1
2008-10-16rebase--interactive: fix parent rewriting for dropped commitsLibravatar Stephen Haberman1-2/+35
2008-10-10rebase -i: do not fail when there is no commit to cherry-pickLibravatar Johannes Schindelin1-1/+2
2008-10-09Merge branch 'sg/maint-intrebase-msghook' into maintLibravatar Shawn O. Pearce1-6/+11
2008-10-06rebase --no-verifyLibravatar Nanako Shiraishi1-1/+9
2008-10-06Teach rebase -i to honor pre-rebase hookLibravatar Nanako Shiraishi1-0/+11
2008-10-03rebase -i: remove leftover debuggingLibravatar SZEDER Gábor1-1/+1
2008-10-02rebase -i: proper prepare-commit-msg hook argument when squashingLibravatar SZEDER Gábor1-6/+11
2008-09-09git-rebase--interactive: auto amend only edited commitLibravatar Dmitry Potapov1-1/+5
2008-09-09git-rebase-interactive: do not squash commits on abortLibravatar Dmitry Potapov1-2/+6
2008-08-13rebase -i -p: fix parent rewritingLibravatar Thomas Rast1-4/+2
2008-08-13rebase -i -p: handle index and workdir correctlyLibravatar Thomas Rast1-2/+12
2008-07-23rebase -i: When an 'edit' stops, mention the commitLibravatar Johannes Sixt1-1/+1
2008-07-16Merge branch 'maint'Libravatar Junio C Hamano1-0/+2
2008-07-16rebase-i: keep old parents when preserving mergesLibravatar Stephan Beyer1-0/+2
2008-07-15Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Libravatar Johannes Schindelin1-1/+1
2008-07-14Merge branch 'jc/rebase-orig-head'Libravatar Junio C Hamano1-0/+1
2008-07-13Make rebase--interactive use OPTIONS_SPECLibravatar Stephan Beyer1-26/+51
2008-07-07Teach "am" and "rebase" to mark the original position with ORIG_HEADLibravatar Junio C Hamano1-0/+1
2008-06-08git-rebase -i: mention the short command aliases in the todo listLibravatar Miklos Vajna1-3/+3
2008-06-02rebase --interactive: Compute upstream SHA1 before switching branchesLibravatar Johannes Sixt1-4/+3
2008-05-15Ignore dirty submodule states during rebase and stashLibravatar Johannes Schindelin1-5/+6
2008-03-13remove use of "tail -n 1" and "tail -1"Libravatar Jeff King1-1/+1
2008-03-13grep portability fix: don't use "-e" or "-q"Libravatar Jeff King1-3/+3
2008-02-27Prompt to continue when editing during rebase --interactiveLibravatar Jonathan del Strother1-0/+4
2008-02-11rebase -i: accept -m as advertised in the man pageLibravatar Uwe Kleine-K,Av(Bnig1-1/+1
2008-01-14Squelch bogus progress output from git-rebase--interactiveLibravatar Junio C Hamano1-2/+7
2007-12-30git-rebase -i: clean-up error check codepath.Libravatar Junio C Hamano1-10/+19
2007-12-30git-rebase -i behaves better on commits with incomplete messagesLibravatar Junio C Hamano1-2/+4
2007-12-20Reallow git-rebase --interactive --continue if commit is unnecessaryLibravatar Shawn O. Pearce1-1/+3
2007-12-19Catch and handle git-commit failures in git-rebase --interactiveLibravatar Shawn O. Pearce1-8/+9
2007-12-19Avoid update hook during git-rebase --interactiveLibravatar Shawn O. Pearce1-2/+2
2007-12-19Fix interactive rebase to preserve author email addressLibravatar Sean1-1/+1
2007-12-17rebase -p -i: handle "no changes" gracefullyLibravatar Johannes Schindelin1-1/+6
2007-12-02Merge branch 'js/rebase-i-rerere'Libravatar Junio C Hamano1-1/+4
2007-11-30revert/cherry-pick: Allow overriding the help text by the calling PorcelainLibravatar Wincent Colaiuta1-0/+5
2007-11-28rebase -i: give rerere a chanceLibravatar Johannes Schindelin1-1/+4
2007-11-28Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2007-11-28scripts: do not get confused with HEAD in work treeLibravatar Junio C Hamano1-2/+2
2007-11-22rebase -i: move help to end of todo fileLibravatar Johannes Schindelin1-6/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 22:53:47 +0000