aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'sb/submodule-recursive-checkout-detach-head'Junio C Hamano2017-12-06
|\
| * Documentation/checkout: clarify submodule HEADs to be detachedStefan Beller2017-07-28
| * recursive submodules: detach HEAD from new stateStefan Beller2017-07-25
* | Sync with v2.15.1Junio C Hamano2017-11-28
|\ \
| * | Git 2.15.1Junio C Hamano2017-11-28
| * | Merge branch 'rs/config-write-section-fix' into maintJunio C Hamano2017-11-28
| |\ \
* | | | RelNotes: the seventh batchJunio C Hamano2017-11-28
* | | | Merge branch 'rs/include-comments-before-the-function-header'Junio C Hamano2017-11-28
|\ \ \ \
| * | | | grep: show non-empty lines before functions with -WRené Scharfe2017-11-21
| * | | | grep: update boundary variable for pre-contextRené Scharfe2017-11-21
| * | | | t7810: improve check of -W with user-defined function linesRené Scharfe2017-11-21
| * | | | xdiff: show non-empty lines before functions with -WRené Scharfe2017-11-21
| * | | | xdiff: factor out is_func_rec()René Scharfe2017-11-21
| * | | | t4051: add test for comments preceding function linesRené Scharfe2017-11-21
* | | | | Merge branch 'ma/branch-list-paginate'Junio C Hamano2017-11-28
|\ \ \ \ \
| * | | | | branch: change default of `pager.branch` to "on"Martin Ågren2017-11-20
| * | | | | branch: respect `pager.branch` in list-mode onlyMartin Ågren2017-11-20
| * | | | | t7006: add tests for how git branch paginatesMartin Ågren2017-11-20
* | | | | | Merge branch 'jc/branch-name-sanity'Junio C Hamano2017-11-28
|\ \ \ \ \ \
| * | | | | | builtin/branch: remove redundant check for HEADKaartic Sivaraam2017-11-15
| * | | | | | branch: correctly reject refs/heads/{-dash,HEAD}Junio C Hamano2017-11-15
| * | | | | | branch: split validate_new_branchname() into twoJunio C Hamano2017-10-13
| * | | | | | branch: streamline "attr_only" handling in validate_new_branchname()Junio C Hamano2017-10-13
* | | | | | | RelNotes: the sixth batch for 2.16Junio C Hamano2017-11-27
* | | | | | | Sync with maintJunio C Hamano2017-11-27
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | A bit more fixes for 2.15.1Junio C Hamano2017-11-27
| * | | | | | Merge branch 'ma/reduce-heads-leakfix' into maintJunio C Hamano2017-11-27
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ma/bisect-leakfix' into maintJunio C Hamano2017-11-27
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/apply-fuzzy-match-fix' into maintJunio C Hamano2017-11-27
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ad/submitting-patches-title-decoration' into maintJunio C Hamano2017-11-27
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/imap-send-next-arg-fix' into maintJunio C Hamano2017-11-27
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | RelNotes: minor typo fixes in 2.15.1 draftTodd Zullinger2017-11-26
* | | | | | | | | | | | Merge branch 'sw/pull-ipv46-passthru'Junio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pull: pass -4/-6 option to 'git fetch'Shuyu Wei2017-11-21
* | | | | | | | | | | | | Merge branch 'ks/rebase-no-git-foo'Junio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-rebase: clean up dashed-usages in messagesKaartic Sivaraam2017-11-21
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/config-write-section-fix'Junio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | config: flip return value of write_section()René Scharfe2017-11-18
* | | | | | | | | | | | | Merge branch 'ew/rebase-mboxrd'Junio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rebase: use mboxrd format to avoid split errorsEric Wong2017-11-18
* | | | | | | | | | | | | | Merge branch 'tb/add-renormalize'Junio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add: introduce "--renormalize"Torsten Bögershausen2017-11-17
* | | | | | | | | | | | | | | Merge branch 'tz/complete-branch-copy'Junio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | completion: add '--copy' option to 'git branch'Todd Zullinger2017-11-17
* | | | | | | | | | | | | | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'Junio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | apply: update line lengths for --inaccurate-eofRené Scharfe2017-11-17
* | | | | | | | | | | | | | | | | Merge branch 'pw/sequencer-recover-from-unlockable-index'Junio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | sequencer: reschedule pick if index can't be lockedPhillip Wood2017-11-16
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'sd/branch-copy'Junio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | config: avoid "write_in_full(fd, buf, len) != len" patternPhillip Wood2017-11-16