summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | object.h: update flag allocation commentNguyễn Thái Ngọc Duy2018-03-065-1/+9
* | | Merge branch 'jk/smart-http-protocol-doc-fix'Junio C Hamano2018-03-141-0/+3
|\ \ \
| * | | smart-http: document flush after "# service" linejk/smart-http-protocol-doc-fixJeff King2018-03-051-0/+3
| |/ /
* | | Merge branch 'jk/add-i-diff-filter'Junio C Hamano2018-03-142-0/+28
|\ \ \
| * | | add--interactive: detect bogus diffFilter outputjk/add-i-diff-filterJeff King2018-03-052-0/+16
| * | | t3701: add a test for interactive.diffFilterJeff King2018-03-051-0/+12
| |/ /
* | | Merge branch 'nd/worktree-move'Junio C Hamano2018-03-148-17/+452
|\ \ \
| * | | t2028: fix minor error and issues in newly-added "worktree move" testsnd/worktree-moveEric Sunshine2018-03-061-10/+9
| * | | worktree remove: allow it when $GIT_WORK_TREE is already goneNguyễn Thái Ngọc Duy2018-02-124-7/+36
| * | | worktree remove: new commandNguyễn Thái Ngọc Duy2018-02-124-11/+179
| * | | worktree move: refuse to move worktrees with submodulesNguyễn Thái Ngọc Duy2018-02-122-1/+24
| * | | worktree move: accept destination as directoryNguyễn Thái Ngọc Duy2018-02-124-1/+32
| * | | worktree move: new commandNguyễn Thái Ngọc Duy2018-02-124-7/+87
| * | | worktree.c: add update_worktree_location()Nguyễn Thái Ngọc Duy2018-02-122-0/+23
| * | | worktree.c: add validate_worktree()Nguyễn Thái Ngọc Duy2018-01-242-0/+81
* | | | Merge branch 'pw/add-p-recount'Junio C Hamano2018-03-142-152/+251
|\ \ \ \
| * | | | add -p: don't rely on apply's '--recount' optionpw/add-p-recountPhillip Wood2018-03-051-1/+1
| * | | | add -p: fix counting when splitting and coalescingPhillip Wood2018-03-052-8/+34
| * | | | add -p: calculate offset delta for edited patchesPhillip Wood2018-03-052-10/+51
| * | | | add -p: adjust offsets of subsequent hunks when one is skippedPhillip Wood2018-03-012-3/+14
| * | | | t3701: add failing test for pathological context linesPhillip Wood2018-03-011-0/+30
| * | | | t3701: don't hard code sha1 hash valuesPhillip Wood2018-03-011-10/+23
| * | | | t3701: use test_write_lines and write_scriptPhillip Wood2018-02-201-28/+5
| * | | | t3701: indent here documentsPhillip Wood2018-02-201-87/+87
| * | | | add -i: add function to format hunk headerPhillip Wood2018-02-201-10/+11
| |/ / /
* | | | Merge branch 'ab/pre-auto-gc-battery'Junio C Hamano2018-03-141-1/+1
|\ \ \ \
| * | | | hooks/pre-auto-gc-battery: allow gc to run on non-laptopsab/pre-auto-gc-batteryAdam Borowski2018-02-281-1/+1
| | |/ / | |/| |
* | | | Merge branch 'sg/test-x'Junio C Hamano2018-03-1412-62/+94
|\ \ \ \
| * | | | travis-ci: run tests with '-x' tracingsg/test-xSZEDER Gábor2018-02-281-1/+1
| * | | | t/README: add a note about don't saving stderr of compound commandsSZEDER Gábor2018-02-281-3/+17
| * | | | t1510-repo-setup: mark as untraceable with '-x'SZEDER Gábor2018-02-281-0/+4
| * | | | t9903-bash-prompt: don't check the stderr of __git_ps1()SZEDER Gábor2018-02-281-12/+2
| * | | | t5570-git-daemon: don't check the stderr of a subshellSZEDER Gábor2018-02-281-1/+1
| * | | | t5526: use $TRASH_DIRECTORY to specify the path of GIT_TRACE log fileSZEDER Gábor2018-02-281-1/+1
| * | | | t5500-fetch-pack: don't check the stderr of a subshellSZEDER Gábor2018-02-281-6/+6
| * | | | t3030-merge-recursive: don't check the stderr of a subshellSZEDER Gábor2018-02-281-16/+20
| * | | | t1507-rev-parse-upstream: don't check the stderr of a shell functionSZEDER Gábor2018-02-271-7/+7
| * | | | t: add means to disable '-x' tracing for individual test scriptsSZEDER Gábor2018-02-272-1/+21
| * | | | t: prevent '-x' tracing from interfering with test helpers' stderrSZEDER Gábor2018-02-272-14/+14
* | | | | Merge branch 'rj/test-i18ngrep'Junio C Hamano2018-03-142-21/+6
|\ \ \ \ \
| * | | | | t5536: simplify checking of messages output to stderrrj/test-i18ngrepSZEDER Gábor2018-02-281-18/+4
| * | | | | t4151: consolidate multiple calls to test_i18ngrepRamsay Jones2018-02-121-3/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'ma/roll-back-lockfiles'Junio C Hamano2018-03-143-22/+27
|\ \ \ \ \
| * | | | | sequencer: do not roll back lockfile unnecessarilyma/roll-back-lockfilesMartin Ågren2018-02-281-12/+6
| * | | | | merge: always roll back lock in `checkout_fast_forward()`Martin Ågren2018-02-281-3/+9
| * | | | | merge-recursive: always roll back lock in `merge_recursive_generic()`Martin Ågren2018-02-281-1/+4
| * | | | | sequencer: always roll back lock in `do_recursive_merge()`Martin Ågren2018-02-271-1/+3
| * | | | | sequencer: make lockfiles non-staticMartin Ågren2018-02-271-5/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'nd/diff-stat-with-summary'Junio C Hamano2018-03-148-33/+109
|\ \ \ \ \
| * | | | | diff: add --compact-summarynd/diff-stat-with-summaryNguyễn Thái Ngọc Duy2018-02-278-0/+83
View Lorry Controller Status