Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ma/branch-list-paginate' | Junio C Hamano | 2017-11-28 | 1 | -0/+38 |
|\ | |||||
| * | branch: change default of `pager.branch` to "on" | Martin Ågren | 2017-11-20 | 1 | -5/+5 |
| * | branch: respect `pager.branch` in list-mode only | Martin Ågren | 2017-11-20 | 1 | -3/+3 |
| * | t7006: add tests for how git branch paginates | Martin Ågren | 2017-11-20 | 1 | -0/+38 |
* | | Merge branch 'jc/branch-name-sanity' | Junio C Hamano | 2017-11-28 | 1 | -0/+43 |
|\ \ | |||||
| * | | branch: correctly reject refs/heads/{-dash,HEAD} | Junio C Hamano | 2017-11-15 | 1 | -0/+43 |
* | | | Merge branch 'ew/rebase-mboxrd' | Junio C Hamano | 2017-11-27 | 1 | -0/+22 |
|\ \ \ | |||||
| * | | | rebase: use mboxrd format to avoid split errors | Eric Wong | 2017-11-18 | 1 | -0/+22 |
| * | | | Merge branch 'js/mingw-redirect-std-handles' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+12 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'js/wincred-empty-cred' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+19 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ad/5580-unc-tests-on-cygwin' into maint | Junio C Hamano | 2017-11-15 | 1 | -4/+10 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'tb/complete-checkout' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jc/check-ref-format-oor' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/t5601-copy-workaround' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/rebase-i-exec-gitdir-fix' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'js/submodule-in-excluded' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maint | Junio C Hamano | 2017-11-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-color-moved-fix' into maint | Junio C Hamano | 2017-11-15 | 1 | -36/+177 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kd/auto-col-with-pager-fix' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/add-renormalize' | Junio C Hamano | 2017-11-27 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | add: introduce "--renormalize" | Torsten Bögershausen | 2017-11-17 | 1 | -0/+30 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' | Junio C Hamano | 2017-11-27 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | apply: update line lengths for --inaccurate-eof | René Scharfe | 2017-11-17 | 1 | -0/+14 |
* | | | | | | | | | | | | | | | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' | Junio C Hamano | 2017-11-27 | 1 | -0/+36 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | merge-recursive: handle addition of submodule on our side of history | Elijah Newren | 2017-11-15 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure | Stefan Beller | 2017-11-12 | 1 | -0/+36 |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'tz/notes-error-to-stderr' | Junio C Hamano | 2017-11-27 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | notes: send "Automatic notes merge failed" messages to stderr | Todd Zullinger | 2017-11-15 | 2 | -5/+5 |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'tz/redirect-fix' | Junio C Hamano | 2017-11-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | t/lib-gpg: fix gpgconf stderr redirect to /dev/null | Todd Zullinger | 2017-11-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 2017-11-27 | 1 | -0/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | diff: --ignore-cr-at-eol | Junio C Hamano | 2017-11-08 | 1 | -0/+28 |
* | | | | | | | | | | | | | | | | | | Merge branch 'av/fsmonitor' | Junio C Hamano | 2017-11-21 | 2 | -11/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | fsmonitor: simplify determining the git worktree under Windows | Ben Peart | 2017-11-13 | 1 | -10/+3 |
| * | | | | | | | | | | | | | | | | | | fsmonitor: store fsmonitor bitmap before splitting index | Alex Vandiver | 2017-11-10 | 1 | -0/+13 |
| * | | | | | | | | | | | | | | | | | | fsmonitor: read from getcwd(), not the PWD environment variable | Alex Vandiver | 2017-11-10 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'bp/fsmonitor' | Junio C Hamano | 2017-11-21 | 9 | -0/+861 |
|\| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | fsmonitor: preserve utf8 filenames in fsmonitor-watchman log | Ben Peart | 2017-10-05 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | fsmonitor: read entirety of watchman output | Alex Vandiver | 2017-10-04 | 1 | -4/+2 |
| * | | | | | | | | | | | | | | | | | | fsmonitor: MINGW support for watchman integration | Ben Peart | 2017-10-04 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | fsmonitor: add a performance test | Ben Peart | 2017-10-01 | 3 | -0/+349 |
| * | | | | | | | | | | | | | | | | | | fsmonitor: add test cases for fsmonitor extension | Ben Peart | 2017-10-01 | 4 | -0/+490 |
| * | | | | | | | | | | | | | | | | | | split-index: disable the fsmonitor extension when running the split index test | Ben Peart | 2017-10-01 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | fsmonitor: add a test tool to dump the index extension | Ben Peart | 2017-10-01 | 2 | -0/+22 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'cb/t4201-robustify' | Junio C Hamano | 2017-11-15 | 2 | -5/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | t4201: make use of abbreviation in the test more robust | Charles Bailey | 2017-11-13 | 2 | -5/+7 |
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'tz/fsf-address-update' | Junio C Hamano | 2017-11-15 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Replace Free Software Foundation address in license notices | Todd Zullinger | 2017-11-09 | 1 | -3/+1 |
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/for-each-ref-remote-name-and-ref' | Junio C Hamano | 2017-11-15 | 1 | -0/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | for-each-ref: test :remotename and :remoteref | Johannes Schindelin | 2017-11-08 | 1 | -0/+32 |