Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'en/directory-renames-nothanks' | Junio C Hamano | 2018-09-04 | 1 | -1/+109 |
|\ | |||||
| * | am: avoid directory rename detection when calling recursive merge machinery | Elijah Newren | 2018-08-30 | 1 | -2/+2 |
| * | t3401: add another directory rename testcase for rebase and am | Elijah Newren | 2018-08-30 | 1 | -1/+109 |
* | | Merge branch 'pw/rebase-i-author-script-fix' | Junio C Hamano | 2018-09-04 | 1 | -3/+15 |
|\ \ | |||||
| * | | sequencer: fix quoting in write_author_script | Phillip Wood | 2018-08-07 | 1 | -3/+15 |
* | | | Merge branch 'sg/test-rebase-editor-fix' | Junio C Hamano | 2018-08-27 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh' | SZEDER Gábor | 2018-08-23 | 1 | -3/+3 |
* | | | | Merge branch 'ab/test-must-be-empty-for-master' | Junio C Hamano | 2018-08-27 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | t6018-rev-list-glob: fix 'empty stdin' test | SZEDER Gábor | 2018-08-22 | 1 | -1/+1 |
* | | | | | Merge branch 'sg/t3420-autostash-fix' | Junio C Hamano | 2018-08-27 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | t3420-rebase-autostash: don't try to grep non-existing files | SZEDER Gábor | 2018-08-22 | 1 | -4/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'sg/t3903-missing-fix' | Junio C Hamano | 2018-08-27 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | t3903-stash: don't try to grep non-existing file | SZEDER Gábor | 2018-08-22 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'sg/t7501-thinkofix' | Junio C Hamano | 2018-08-27 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | t7501-commit: drop silly command substitution | SZEDER Gábor | 2018-08-22 | 1 | -1/+1 |
* | | | | | | Merge branch 'sg/t0020-conversion-fix' | Junio C Hamano | 2018-08-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t0020-crlf: check the right file | SZEDER Gábor | 2018-08-22 | 1 | -1/+1 |
* | | | | | | | Merge branch 'sg/t4051-fix' | Junio C Hamano | 2018-08-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t4051-diff-function-context: read the right file | SZEDER Gábor | 2018-08-22 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jk/use-compat-util-in-test-tool' | Junio C Hamano | 2018-08-27 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | test-tool.h: include git-compat-util.h | Jeff King | 2018-08-21 | 1 | -0/+2 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sg/test-must-be-empty' | Junio C Hamano | 2018-08-27 | 77 | -344/+231 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>' | SZEDER Gábor | 2018-08-21 | 46 | -226/+114 |
| * | | | | | | | | tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>' | SZEDER Gábor | 2018-08-21 | 10 | -16/+16 |
| * | | | | | | | | tests: use 'test_must_be_empty' instead of 'test ! -s' | SZEDER Gábor | 2018-08-21 | 4 | -4/+4 |
| * | | | | | | | | tests: use 'test_must_be_empty' instead of '! test -s' | SZEDER Gábor | 2018-08-21 | 25 | -99/+98 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ep/worktree-quiet-option' | Junio C Hamano | 2018-08-27 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | worktree: add --quiet option | Elia Pinto | 2018-08-18 | 1 | -0/+5 |
* | | | | | | | | | Merge branch 'sm/branch-sort-config' | Junio C Hamano | 2018-08-27 | 1 | -0/+46 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | branch: support configuring --sort via .gitconfig | Samuel Maftoul | 2018-08-16 | 1 | -0/+46 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'nd/pack-deltify-regression-fix' | Junio C Hamano | 2018-08-22 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pack-objects: fix performance issues on packing large deltas | Nguyễn Thái Ngọc Duy | 2018-07-23 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch 'ab/checkout-default-remote' | Junio C Hamano | 2018-08-20 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t2024: mark test using "checkout -p" with PERL prerequisite | Ævar Arnfjörð Bjarmason | 2018-08-18 | 1 | -2/+7 |
* | | | | | | | | | | | Merge branch 'hn/highlight-sideband-keywords' | Junio C Hamano | 2018-08-20 | 1 | -0/+101 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | sideband: do not read beyond the end of input | Junio C Hamano | 2018-08-18 | 1 | -0/+14 |
| * | | | | | | | | | | | sideband: highlight keywords in remote sideband output | Han-Wen Nienhuys | 2018-08-09 | 1 | -0/+87 |
* | | | | | | | | | | | | Merge branch 'nd/cherry-pick-quit-fix' | Junio C Hamano | 2018-08-20 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD | Nguyễn Thái Ngọc Duy | 2018-08-16 | 1 | -1/+6 |
* | | | | | | | | | | | | | Merge branch 'sb/submodule-cleanup' | Junio C Hamano | 2018-08-20 | 1 | -41/+58 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t7410: update to new style | Stefan Beller | 2018-08-16 | 1 | -41/+58 |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'pw/rebase-i-merge-segv-fix' | Junio C Hamano | 2018-08-20 | 1 | -7/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | rebase -i: fix SIGSEGV when 'merge <branch>' fails | Phillip Wood | 2018-08-16 | 1 | -1/+14 |
| * | | | | | | | | | | | | | t3430: add conflicting commit | Phillip Wood | 2018-08-16 | 1 | -6/+9 |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'pw/rebase-i-squash-number-fix' | Junio C Hamano | 2018-08-20 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | rebase -i: fix numbering in squash message | Phillip Wood | 2018-08-15 | 1 | -1/+3 |
* | | | | | | | | | | | | | | Merge branch 'sb/config-write-fix' | Junio C Hamano | 2018-08-20 | 1 | -0/+87 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | config: fix case sensitive subsection names on writing | Stefan Beller | 2018-08-08 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | t1300: document current behavior of setting options | Stefan Beller | 2018-08-01 | 1 | -0/+86 |
* | | | | | | | | | | | | | | | Merge branch 'ab/submodule-relative-url-tests' | Junio C Hamano | 2018-08-20 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |