summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* strbuf: remove unused stripspace function aliasen/remove-stripspaceElijah Newren2017-12-051-9/+0
* Sync with v2.15.1Junio C Hamano2017-11-281-0/+3
|\
| * Git 2.15.1v2.15.1Junio C Hamano2017-11-281-0/+3
| * Merge branch 'rs/config-write-section-fix' into maintJunio C Hamano2017-11-281-1/+1
| |\
* | | RelNotes: the seventh batchJunio C Hamano2017-11-281-1/+13
* | | Merge branch 'rs/include-comments-before-the-function-header'Junio C Hamano2017-11-285-20/+76
|\ \ \
| * | | grep: show non-empty lines before functions with -Wrs/include-comments-before-the-function-headerRené Scharfe2017-11-212-5/+24
| * | | grep: update boundary variable for pre-contextRené Scharfe2017-11-211-6/+8
| * | | t7810: improve check of -W with user-defined function linesRené Scharfe2017-11-211-10/+31
| * | | xdiff: show non-empty lines before functions with -WRené Scharfe2017-11-212-1/+4
| * | | xdiff: factor out is_func_rec()René Scharfe2017-11-211-3/+7
| * | | t4051: add test for comments preceding function linesRené Scharfe2017-11-212-0/+7
* | | | Merge branch 'ma/branch-list-paginate'Junio C Hamano2017-11-284-1/+48
|\ \ \ \
| * | | | branch: change default of `pager.branch` to "on"ma/branch-list-paginateMartin Ågren2017-11-203-7/+7
| * | | | branch: respect `pager.branch` in list-mode onlyMartin Ågren2017-11-204-4/+13
| * | | | t7006: add tests for how git branch paginatesMartin Ågren2017-11-201-0/+38
* | | | | Merge branch 'jc/branch-name-sanity'Junio C Hamano2017-11-286-43/+106
|\ \ \ \ \
| * | | | | builtin/branch: remove redundant check for HEADjc/branch-name-sanityKaartic Sivaraam2017-11-151-3/+0
| * | | | | branch: correctly reject refs/heads/{-dash,HEAD}Junio C Hamano2017-11-152-2/+55
| * | | | | branch: split validate_new_branchname() into twoJunio C Hamano2017-10-134-35/+44
| * | | | | branch: streamline "attr_only" handling in validate_new_branchname()Junio C Hamano2017-10-131-8/+12
* | | | | | RelNotes: the sixth batch for 2.16Junio C Hamano2017-11-271-8/+65
* | | | | | Sync with maintJunio C Hamano2017-11-271-3/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | A bit more fixes for 2.15.1Junio C Hamano2017-11-271-0/+5
| * | | | | Merge branch 'ma/reduce-heads-leakfix' into maintJunio C Hamano2017-11-277-23/+52
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ma/bisect-leakfix' into maintJunio C Hamano2017-11-273-19/+29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/apply-fuzzy-match-fix' into maintJunio C Hamano2017-11-271-39/+20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ad/submitting-patches-title-decoration' into maintJunio C Hamano2017-11-271-8/+13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/imap-send-next-arg-fix' into maintJunio C Hamano2017-11-271-2/+13
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | RelNotes: minor typo fixes in 2.15.1 draftTodd Zullinger2017-11-261-3/+3
* | | | | | | | | | | Merge branch 'sw/pull-ipv46-passthru'Junio C Hamano2017-11-271-0/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pull: pass -4/-6 option to 'git fetch'sw/pull-ipv46-passthruShuyu Wei2017-11-211-0/+12
* | | | | | | | | | | | Merge branch 'ks/rebase-no-git-foo'Junio C Hamano2017-11-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-rebase: clean up dashed-usages in messagesks/rebase-no-git-fooKaartic Sivaraam2017-11-211-2/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'rs/config-write-section-fix'Junio C Hamano2017-11-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | config: flip return value of write_section()rs/config-write-section-fixRené Scharfe2017-11-181-1/+1
* | | | | | | | | | | | Merge branch 'ew/rebase-mboxrd'Junio C Hamano2017-11-272-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase: use mboxrd format to avoid split errorsew/rebase-mboxrdEric Wong2017-11-182-0/+24
* | | | | | | | | | | | | Merge branch 'tb/add-renormalize'Junio C Hamano2017-11-277-18/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add: introduce "--renormalize"tb/add-renormalizeTorsten Bögershausen2017-11-177-18/+102
* | | | | | | | | | | | | | Merge branch 'tz/complete-branch-copy'Junio C Hamano2017-11-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | completion: add '--copy' option to 'git branch'tz/complete-branch-copyTodd Zullinger2017-11-171-1/+1
* | | | | | | | | | | | | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'Junio C Hamano2017-11-272-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | apply: update line lengths for --inaccurate-eofrs/apply-inaccurate-eof-with-incomplete-lineRené Scharfe2017-11-172-0/+16
* | | | | | | | | | | | | | | | Merge branch 'pw/sequencer-recover-from-unlockable-index'Junio C Hamano2017-11-271-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | sequencer: reschedule pick if index can't be lockedpw/sequencer-recover-from-unlockable-indexPhillip Wood2017-11-161-1/+2
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'sd/branch-copy'Junio C Hamano2017-11-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | config: avoid "write_in_full(fd, buf, len) != len" patternsd/branch-copyPhillip Wood2017-11-161-2/+2
* | | | | | | | | | | | | | | | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'Junio C Hamano2017-11-272-2/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | merge-recursive: handle addition of submodule on our side of historysb/test-cherry-pick-submodule-getting-in-a-wayElijah Newren2017-11-152-3/+4