summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-01-10Merge branch 'jt/fetch-no-redundant-tag-fetch-map'Libravatar Junio C Hamano1-3/+0
2017-01-10Merge branch 'jc/latin-1'Libravatar Junio C Hamano1-11/+25
2017-01-10mergetool: fix running in subdir when rerere enabledLibravatar Richard Hansen2-3/+21
2017-01-10mergetool: take the "-O" out of $orderfileLibravatar Richard Hansen1-2/+2
2017-01-10t7610: add test case for rerere+mergetool+subdir bugLibravatar Richard Hansen1-1/+20
2017-01-10t7610: spell 'git reset --hard' consistentlyLibravatar Richard Hansen1-18/+19
2017-01-10t7610: don't assume the checked-out commitLibravatar Richard Hansen1-6/+6
2017-01-10t7610: always work on a test-specific branchLibravatar Richard Hansen1-2/+8
2017-01-10t7610: delete some now-unnecessary 'git reset --hard' linesLibravatar Richard Hansen1-2/+0
2017-01-10t7610: run 'git reset --hard' after each test to clean upLibravatar Richard Hansen1-0/+8
2017-01-10t7610: don't rely on state from previous testLibravatar Richard Hansen1-0/+6
2017-01-10t7610: use test_when_finished for cleanup tasksLibravatar Richard Hansen1-34/+37
2017-01-10t7610: move setup code to the 'setup' test caseLibravatar Richard Hansen1-30/+35
2017-01-10t7610: update branch names to match test numberLibravatar Richard Hansen1-41/+41
2017-01-10rev-parse doc: pass "--" to rev-parse in the --prefix exampleLibravatar Richard Hansen1-1/+2
2017-01-10unpack-trees: factor progress setup out of check_updatesLibravatar Stefan Beller1-12/+20
2017-01-10unpack-trees: remove unneeded continueLibravatar Stefan Beller1-1/+0
2017-01-10unpack-trees: move checkout state into check_updatesLibravatar Stefan Beller1-12/+12
2017-01-10.mailmap: record canonical email for Richard HansenLibravatar Richard Hansen1-0/+2
2017-01-09pathspec: give better message for submodule related pathspec errorLibravatar Stefan Beller2-2/+69
2017-01-09sequencer (rebase -i): differentiate between comments and 'noop'Libravatar Johannes Schindelin1-6/+9
2017-01-09sequencer (rebase -i): implement the 'drop' commandLibravatar Johannes Schindelin1-3/+5
2017-01-09sequencer (rebase -i): allow rescheduling commandsLibravatar Johannes Schindelin1-0/+6
2017-01-09sequencer (rebase -i): respect strategy/strategy_opts settingsLibravatar Johannes Schindelin1-1/+25
2017-01-09sequencer (rebase -i): respect the rebase.autostash settingLibravatar Johannes Schindelin1-0/+43
2017-01-09sequencer (rebase -i): run the post-rewrite hook, if neededLibravatar Johannes Schindelin1-0/+14
2017-01-09sequencer (rebase -i): record interrupted commits in rewritten, tooLibravatar Johannes Schindelin1-0/+8
2017-01-09sequencer (rebase -i): copy commit notes at endLibravatar Johannes Schindelin1-0/+76
2017-01-09sequencer (rebase -i): set the reflog message consistentlyLibravatar Johannes Schindelin1-0/+4
2017-01-09sequencer (rebase -i): refactor setting the reflog messageLibravatar Johannes Schindelin1-7/+26
2017-01-09sequencer (rebase -i): allow fast-forwarding for edit/rewordLibravatar Johannes Schindelin1-8/+17
2017-01-09sequencer (rebase -i): implement the 'reword' commandLibravatar Johannes Schindelin1-2/+7
2017-01-09sequencer (rebase -i): leave a patch upon errorLibravatar Johannes Schindelin1-1/+3
2017-01-09sequencer (rebase -i): update refs after a successful rebaseLibravatar Johannes Schindelin1-1/+45
2017-01-09sequencer (rebase -i): the todo can be empty when continuingLibravatar Johannes Schindelin1-2/+5
2017-01-09sequencer (rebase -i): skip some revert/cherry-pick specific code pathLibravatar Johannes Schindelin1-12/+14
2017-01-09sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer neededLibravatar Johannes Schindelin1-1/+6
2017-01-09sequencer (rebase -i): allow continuing with staged changesLibravatar Johannes Schindelin1-0/+40
2017-01-09sequencer (rebase -i): write an author-script fileLibravatar Johannes Schindelin1-1/+49
2017-01-09sequencer (rebase -i): implement the short commandsLibravatar Johannes Schindelin1-14/+21
2017-01-09sequencer (rebase -i): add support for the 'fixup' and 'squash' commandsLibravatar Johannes Schindelin1-10/+217
2017-01-09sequencer (rebase -i): write the 'done' fileLibravatar Johannes Schindelin1-0/+23
2017-01-09sequencer (rebase -i): learn about the 'verbose' modeLibravatar Johannes Schindelin2-0/+29
2017-01-09sequencer (rebase -i): implement the 'exec' commandLibravatar Johannes Schindelin1-0/+57
2017-01-09sequencer (rebase -i): implement the 'edit' commandLibravatar Johannes Schindelin1-3/+114
2017-01-09sequencer (rebase -i): implement the 'noop' commandLibravatar Johannes Schindelin1-3/+36
2017-01-09sequencer: support a new action: 'interactive rebase'Libravatar Johannes Schindelin2-5/+34
2017-01-09sequencer: use a helper to find the commit messageLibravatar Johannes Schindelin1-8/+3
2017-01-09sequencer: move "else" keyword onto the same line as preceding braceLibravatar Johannes Schindelin1-2/+1
2017-01-09sequencer: avoid unnecessary curly bracesLibravatar Johannes Schindelin1-2/+1