Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | sha1dc_git.h: re-arrange an ifdef chain for a subsequent changeab/sha1dc-build | Ævar Arnfjörð Bjarmason | 2017-12-08 | 1 | -3/+3 |
* | Makefile: under "make dist", include the sha1collisiondetection submodule | Ævar Arnfjörð Bjarmason | 2017-12-08 | 1 | -0/+15 |
* | Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto | Ævar Arnfjörð Bjarmason | 2017-12-08 | 1 | -0/+2 |
* | Sync with v2.15.1 | Junio C Hamano | 2017-11-28 | 1 | -0/+3 |
|\ | |||||
| * | Git 2.15.1v2.15.1 | Junio C Hamano | 2017-11-28 | 1 | -0/+3 |
| * | Merge branch 'rs/config-write-section-fix' into maint | Junio C Hamano | 2017-11-28 | 1 | -1/+1 |
| |\ | |||||
* | | | RelNotes: the seventh batch | Junio C Hamano | 2017-11-28 | 1 | -1/+13 |
* | | | Merge branch 'rs/include-comments-before-the-function-header' | Junio C Hamano | 2017-11-28 | 5 | -20/+76 |
|\ \ \ | |||||
| * | | | grep: show non-empty lines before functions with -Wrs/include-comments-before-the-function-header | René Scharfe | 2017-11-21 | 2 | -5/+24 |
| * | | | grep: update boundary variable for pre-context | René Scharfe | 2017-11-21 | 1 | -6/+8 |
| * | | | t7810: improve check of -W with user-defined function lines | René Scharfe | 2017-11-21 | 1 | -10/+31 |
| * | | | xdiff: show non-empty lines before functions with -W | René Scharfe | 2017-11-21 | 2 | -1/+4 |
| * | | | xdiff: factor out is_func_rec() | René Scharfe | 2017-11-21 | 1 | -3/+7 |
| * | | | t4051: add test for comments preceding function lines | René Scharfe | 2017-11-21 | 2 | -0/+7 |
* | | | | Merge branch 'ma/branch-list-paginate' | Junio C Hamano | 2017-11-28 | 4 | -1/+48 |
|\ \ \ \ | |||||
| * | | | | branch: change default of `pager.branch` to "on"ma/branch-list-paginate | Martin Ågren | 2017-11-20 | 3 | -7/+7 |
| * | | | | branch: respect `pager.branch` in list-mode only | Martin Ågren | 2017-11-20 | 4 | -4/+13 |
| * | | | | 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 | 6 | -43/+106 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/branch: remove redundant check for HEADjc/branch-name-sanity | Kaartic Sivaraam | 2017-11-15 | 1 | -3/+0 |
| * | | | | | branch: correctly reject refs/heads/{-dash,HEAD} | Junio C Hamano | 2017-11-15 | 2 | -2/+55 |
| * | | | | | branch: split validate_new_branchname() into two | Junio C Hamano | 2017-10-13 | 4 | -35/+44 |
| * | | | | | branch: streamline "attr_only" handling in validate_new_branchname() | Junio C Hamano | 2017-10-13 | 1 | -8/+12 |
* | | | | | | RelNotes: the sixth batch for 2.16 | Junio C Hamano | 2017-11-27 | 1 | -8/+65 |
* | | | | | | Sync with maint | Junio C Hamano | 2017-11-27 | 1 | -3/+8 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | A bit more fixes for 2.15.1 | Junio C Hamano | 2017-11-27 | 1 | -0/+5 |
| * | | | | | Merge branch 'ma/reduce-heads-leakfix' into maint | Junio C Hamano | 2017-11-27 | 7 | -23/+52 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ma/bisect-leakfix' into maint | Junio C Hamano | 2017-11-27 | 3 | -19/+29 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'rs/apply-fuzzy-match-fix' into maint | Junio C Hamano | 2017-11-27 | 1 | -39/+20 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ad/submitting-patches-title-decoration' into maint | Junio C Hamano | 2017-11-27 | 1 | -8/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rs/imap-send-next-arg-fix' into maint | Junio C Hamano | 2017-11-27 | 1 | -2/+13 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | RelNotes: minor typo fixes in 2.15.1 draft | Todd Zullinger | 2017-11-26 | 1 | -3/+3 |
* | | | | | | | | | | | Merge branch 'sw/pull-ipv46-passthru' | Junio C Hamano | 2017-11-27 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | pull: pass -4/-6 option to 'git fetch'sw/pull-ipv46-passthru | Shuyu Wei | 2017-11-21 | 1 | -0/+12 |
* | | | | | | | | | | | | Merge branch 'ks/rebase-no-git-foo' | Junio C Hamano | 2017-11-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-rebase: clean up dashed-usages in messagesks/rebase-no-git-foo | Kaartic Sivaraam | 2017-11-21 | 1 | -2/+2 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'rs/config-write-section-fix' | Junio C Hamano | 2017-11-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | config: flip return value of write_section()rs/config-write-section-fix | René Scharfe | 2017-11-18 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'ew/rebase-mboxrd' | Junio C Hamano | 2017-11-27 | 2 | -0/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | rebase: use mboxrd format to avoid split errorsew/rebase-mboxrd | Eric Wong | 2017-11-18 | 2 | -0/+24 |
* | | | | | | | | | | | | | Merge branch 'tb/add-renormalize' | Junio C Hamano | 2017-11-27 | 7 | -18/+102 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | add: introduce "--renormalize"tb/add-renormalize | Torsten Bögershausen | 2017-11-17 | 7 | -18/+102 |
* | | | | | | | | | | | | | | Merge branch 'tz/complete-branch-copy' | Junio C Hamano | 2017-11-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | completion: add '--copy' option to 'git branch'tz/complete-branch-copy | Todd Zullinger | 2017-11-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' | Junio C Hamano | 2017-11-27 | 2 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | apply: update line lengths for --inaccurate-eofrs/apply-inaccurate-eof-with-incomplete-line | René Scharfe | 2017-11-17 | 2 | -0/+16 |
* | | | | | | | | | | | | | | | | Merge branch 'pw/sequencer-recover-from-unlockable-index' | Junio C Hamano | 2017-11-27 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | sequencer: reschedule pick if index can't be lockedpw/sequencer-recover-from-unlockable-index | Phillip Wood | 2017-11-16 | 1 | -1/+2 |
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'sd/branch-copy' | Junio C Hamano | 2017-11-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | config: avoid "write_in_full(fd, buf, len) != len" patternsd/branch-copy | Phillip Wood | 2017-11-16 | 1 | -2/+2 |