summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | Merge branch 'rd/doc-notes-prune-fix'Junio C Hamano2017-12-062-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | notes: correct 'git notes prune' options to '[-n] [-v]'rd/doc-notes-prune-fixRobert P. J. Day2017-11-222-2/+2
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'rd/man-reflog-add-n'Junio C Hamano2017-12-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | doc: add missing "-n" (dry-run) option to reflog man pagerd/man-reflog-add-npd/man-reflog-add-nRobert P. J. Day2017-11-221-2/+2
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'rd/man-prune-progress'Junio C Hamano2017-12-062-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | prune: add "--progress" to man page and usage msgrd/man-prune-progresspd/man-prune-progressRobert P. J. Day2017-11-222-4/+7
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'jt/submodule-tests-cleanup'Junio C Hamano2017-12-061-218/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Tests: clean up submodule recursive helpersjt/submodule-tests-cleanupJonathan Tan2017-11-221-218/+125
* | | | | | | | | | | | | | | | | | | Merge branch 'jn/reproducible-build'Junio C Hamano2017-12-062-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/reproducible-build' of ../git-gui into jn/reproducible-buildjn/reproducible-buildJunio C Hamano2017-11-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | git-gui: sort entries in optimized tclIndexAnders Kaseorg2017-11-221-1/+1
| * | | | | | | | | | | | | | | | | | | | generate-cmdlist: avoid non-deterministic outputJonathan Nieder2017-11-221-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/git-packet-pm'Junio C Hamano2017-12-062-12/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Git/Packet.pm: use 'if' instead of 'unless'cc/git-packet-pmChristian Couder2017-11-221-8/+8
| * | | | | | | | | | | | | | | | | | | | | Git/Packet: clarify that packet_required_key_val_read allows EOFChristian Couder2017-11-222-4/+9
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ac/complete-pull-autostash'Junio C Hamano2017-12-061-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | completion: add --autostash and --no-autostash to pullac/complete-pull-autostashAlbert Astals Cid2017-11-221-0/+1
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'hm/config-parse-expiry-date'Junio C Hamano2017-12-067-13/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | config: add --expiry-datehm/config-parse-expiry-dateHaaris Mehmood2017-11-187-13/+69
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tz/branch-doc-remove-set-upstream'Junio C Hamano2017-12-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | branch doc: remove --set-upstream from synopsistz/branch-doc-remove-set-upstreamTodd Zullinger2017-11-171-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/perf-run-config'Junio C Hamano2017-12-063-15/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | perf: store subsection results in "test-results/$GIT_PERF_SUBSECTION/"cc/perf-run-configChristian Couder2017-09-242-3/+9
| * | | | | | | | | | | | | | | | | | | | | | | | perf/run: show name of rev being builtChristian Couder2017-09-241-2/+3
| * | | | | | | | | | | | | | | | | | | | | | | | perf/run: add run_subsection()Christian Couder2017-09-241-12/+35
| * | | | | | | | | | | | | | | | | | | | | | | | perf/run: update get_var_from_env_or_config() for subsectionsChristian Couder2017-09-241-12/+20
| * | | | | | | | | | | | | | | | | | | | | | | | perf/run: add get_subsections()Christian Couder2017-09-241-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | perf/run: add calls to get_var_from_env_or_config()Christian Couder2017-09-241-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | perf/run: add GIT_PERF_DIRS_OR_REVSChristian Couder2017-09-241-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | perf/run: add get_var_from_env_or_config()Christian Couder2017-09-242-3/+21
| * | | | | | | | | | | | | | | | | | | | | | | | perf/run: add '--config' option to the 'run' scriptChristian Couder2017-09-241-1/+6
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-recursive-checkout-detach-head'Junio C Hamano2017-12-063-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Documentation/checkout: clarify submodule HEADs to be detachedsb/submodule-recursive-checkout-detach-headStefan Beller2017-07-281-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | recursive submodules: detach HEAD from new stateStefan Beller2017-07-252-1/+19
* | | | | | | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \