aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-01-17sequencer (rebase -i): write out the final messageJohannes Schindelin1-0/+3
2017-01-17sequencer (rebase -i): write the progress into filesJohannes Schindelin1-3/+27
2017-01-17sequencer (rebase -i): show the progressJohannes Schindelin1-0/+32
2017-01-17sequencer (rebase -i): suggest --edit-todo upon unknown commandJohannes Schindelin1-1/+5
2017-01-17sequencer (rebase -i): show only failed cherry-picks' outputJohannes Schindelin1-0/+4
2017-01-17sequencer (rebase -i): show only failed `git commit`'s outputJohannes Schindelin1-0/+18
2017-01-17sequencer: use run_command() directlyJohannes Schindelin1-20/+16
2017-01-17sequencer: update reading author-scriptJohannes Schindelin2-22/+28
2017-01-09sequencer (rebase -i): differentiate between comments and 'noop'Johannes Schindelin1-6/+9
2017-01-09sequencer (rebase -i): implement the 'drop' commandJohannes Schindelin1-3/+5
2017-01-09sequencer (rebase -i): allow rescheduling commandsJohannes Schindelin1-0/+6
2017-01-09sequencer (rebase -i): respect strategy/strategy_opts settingsJohannes Schindelin1-1/+25
2017-01-09sequencer (rebase -i): respect the rebase.autostash settingJohannes Schindelin1-0/+43
2017-01-09sequencer (rebase -i): run the post-rewrite hook, if neededJohannes Schindelin1-0/+14
2017-01-09sequencer (rebase -i): record interrupted commits in rewritten, tooJohannes Schindelin1-0/+8
2017-01-09sequencer (rebase -i): copy commit notes at endJohannes Schindelin1-0/+76
2017-01-09sequencer (rebase -i): set the reflog message consistentlyJohannes Schindelin1-0/+4
2017-01-09sequencer (rebase -i): refactor setting the reflog messageJohannes Schindelin1-7/+26
2017-01-09sequencer (rebase -i): allow fast-forwarding for edit/rewordJohannes Schindelin1-8/+17
2017-01-09sequencer (rebase -i): implement the 'reword' commandJohannes Schindelin1-2/+7
2017-01-09sequencer (rebase -i): leave a patch upon errorJohannes Schindelin1-1/+3
2017-01-09sequencer (rebase -i): update refs after a successful rebaseJohannes Schindelin1-1/+45
2017-01-09sequencer (rebase -i): the todo can be empty when continuingJohannes Schindelin1-2/+5
2017-01-09sequencer (rebase -i): skip some revert/cherry-pick specific code pathJohannes Schindelin1-12/+14
2017-01-09sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer neededJohannes Schindelin1-1/+6
2017-01-09sequencer (rebase -i): allow continuing with staged changesJohannes Schindelin1-0/+40
2017-01-09sequencer (rebase -i): write an author-script fileJohannes Schindelin1-1/+49
2017-01-09sequencer (rebase -i): implement the short commandsJohannes Schindelin1-14/+21
2017-01-09sequencer (rebase -i): add support for the 'fixup' and 'squash' commandsJohannes Schindelin1-10/+217
2017-01-09sequencer (rebase -i): write the 'done' fileJohannes Schindelin1-0/+23
2017-01-09sequencer (rebase -i): learn about the 'verbose' modeJohannes Schindelin2-0/+29
2017-01-09sequencer (rebase -i): implement the 'exec' commandJohannes Schindelin1-0/+57
2017-01-09sequencer (rebase -i): implement the 'edit' commandJohannes Schindelin1-3/+114
2017-01-09sequencer (rebase -i): implement the 'noop' commandJohannes Schindelin1-3/+36
2017-01-09sequencer: support a new action: 'interactive rebase'Johannes Schindelin2-5/+34
2017-01-09sequencer: use a helper to find the commit messageJohannes Schindelin1-8/+3
2017-01-09sequencer: move "else" keyword onto the same line as preceding braceJohannes Schindelin1-2/+1
2017-01-09sequencer: avoid unnecessary curly bracesJohannes Schindelin1-2/+1
2016-12-27Fourth batch for 2.12Junio C Hamano1-0/+42
2016-12-27Merge branch 'jc/lock-report-on-error'Junio C Hamano1-1/+1
2016-12-27lockfile: move REPORT_ON_ERROR bit elsewhereJunio C Hamano1-1/+1
2016-12-27Merge branch 'js/mingw-isatty'Junio C Hamano1-114/+84
2016-12-27Merge branch 'ls/p4-lfs'Junio C Hamano2-14/+14
2016-12-27Merge branch 'va/i18n-even-more'Junio C Hamano2-3/+4
2016-12-27Merge branch 'lt/shortlog-by-committer'Junio C Hamano4-3/+36
2016-12-27Merge branch 'mk/mingw-winansi-ttyname-termination-fix'Junio C Hamano1-1/+1
2016-12-27Merge branch 'gv/p4-multi-path-commit-fix'Junio C Hamano2-3/+23
2016-12-27Merge branch 'jk/difftool-in-subdir'Junio C Hamano1-24/+29
2016-12-27Merge branch 'ld/p4-compare-dir-vs-symlink'Junio C Hamano2-6/+63
2016-12-27Merge branch 'ls/filter-process'Junio C Hamano4-29/+24