summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* doc/interpret-trailers: fix "the this" typojk/trailers-parseMartin Ågren2017-08-201-1/+1
* pretty: support normalization options for %(trailers)Jeff King2017-08-154-6/+79
* t4205: refactor %(trailers) testsJeff King2017-08-151-8/+12
* pretty: move trailer formatting to trailer.cJeff King2017-08-153-11/+34
* interpret-trailers: add --parse convenience optionJeff King2017-08-152-7/+26
* interpret-trailers: add an option to unfold valuesJeff King2017-08-155-0/+56
* interpret-trailers: add an option to show only existing trailersJeff King2017-08-155-4/+34
* interpret-trailers: add an option to show only the trailersJeff King2017-08-155-9/+58
* trailer: put process_trailers() options into a structJeff King2017-08-103-12/+21
* Git 2.13.4v2.13.4Junio C Hamano2017-08-011-1/+1
* Preparation for 2.13.4 continuesJunio C Hamano2017-07-311-0/+18
* Merge branch 'ks/doc-fixes' into maintJunio C Hamano2017-07-312-10/+11
|\
| * doc: reformat the paragraph containing the 'cut-line'ks/doc-fixesKaartic Sivaraam2017-07-181-5/+6
| * doc: camelCase the i18n config variables to improve readabilityKaartic Sivaraam2017-07-171-5/+5
* | Merge branch 'jk/test-copy-bytes-fix' into maintJunio C Hamano2017-07-311-0/+1
|\ \
| * | t: handle EOF in test_copy_bytes()jk/test-copy-bytes-fixJeff King2017-07-171-0/+1
| |/
* | Merge branch 'pw/unquote-path-in-git-pm' into maintJunio C Hamano2017-07-313-43/+61
|\ \
| * | t9700: add tests for Git::unquote_path()pw/unquote-path-in-git-pmPhillip Wood2017-06-301-0/+7
| * | Git::unquote_path(): throw an exception on bad pathPhillip Wood2017-06-301-2/+2
| * | Git::unquote_path(): handle '\a'Phillip Wood2017-06-301-1/+2
| * | add -i: move unquote_path() to Git.pmPhillip Wood2017-06-302-43/+53
* | | Merge branch 'jk/gc-pre-detach-under-hook' into maintJunio C Hamano2017-07-312-0/+25
|\ \ \
| * | | gc: run pre-detach operations under lockjk/gc-pre-detach-under-hookJeff King2017-07-122-0/+25
* | | | Merge branch 'jn/hooks-pre-rebase-sample-fix' into maintJunio C Hamano2017-07-311-3/+3
|\ \ \ \
| * | | | pre-rebase hook: capture documentation in a <<here documentjn/hooks-pre-rebase-sample-fixJonathan Nieder2017-07-111-3/+3
* | | | | Merge branch 'rs/progress-overall-throughput-at-the-end' into maintJunio C Hamano2017-07-311-2/+6
|\ \ \ \ \
| * | | | | progress: show overall rate in last updaters/progress-overall-throughput-at-the-endRené Scharfe2017-07-091-2/+6
* | | | | | Merge branch 'tb/push-to-cygwin-unc-path' into maintJunio C Hamano2017-07-315-0/+27
|\ \ \ \ \ \
| * | | | | | cygwin: allow pushing to UNC pathstb/push-to-cygwin-unc-pathTorsten Bögershausen2017-07-055-0/+27
| |/ / / / /
* | | | | | Merge branch 'rs/apply-avoid-over-reading' into maintJunio C Hamano2017-07-311-4/+2
|\ \ \ \ \ \
| * | | | | | apply: use strcmp(3) for comparing strings in gitdiff_verify_name()rs/apply-avoid-over-readingRené Scharfe2017-07-091-2/+1
| * | | | | | apply: use starts_with() in gitdiff_verify_name()René Scharfe2017-07-011-2/+1
* | | | | | | fixes from 'master' for 2.13.4Junio C Hamano2017-07-212-1/+11
* | | | | | | Merge branch 'ew/fd-cloexec-fix' into maintJunio C Hamano2017-07-211-3/+3
|\ \ \ \ \ \ \
| * | | | | | | set FD_CLOEXEC properly when O_CLOEXEC is not supportedew/fd-cloexec-fixEric Wong2017-07-171-3/+3
* | | | | | | | Merge branch 'ks/fix-rebase-doc-picture' into maintJunio C Hamano2017-07-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: correct a mistake in an illustrationks/fix-rebase-doc-pictureKaartic Sivaraam2017-07-101-1/+1
* | | | | | | | | Merge branch 'js/alias-case-sensitivity' into maintJunio C Hamano2017-07-212-1/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | alias: compare alias name *case-insensitively*js/alias-case-sensitivityJohannes Schindelin2017-07-172-2/+2
| * | | | | | | | | t1300: demonstrate that CamelCased aliases regressedJohannes Schindelin2017-07-171-0/+7
* | | | | | | | | | Merge branch 'bb/unicode-10.0' into maintJunio C Hamano2017-07-211-13/+29
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | unicode: update the width tables to Unicode 10bb/unicode-10.0Beat Bolli2017-07-071-13/+29
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Git 2.13.3v2.13.3Junio C Hamano2017-07-122-1/+10
* | | | | | | | | Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano2017-07-123-7/+54
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ref-filter.c: drop return from void functionkn/ref-filter-branch-listAlejandro R. Sedeño2017-07-101-1/+1
| * | | | | | | | | branch: set remote color in ref-filter branch immediatelyJeff King2017-07-091-5/+6
| * | | | | | | | | branch: use BRANCH_COLOR_LOCAL in ref-filter formatJeff King2017-07-092-2/+47
| * | | | | | | | | branch: only perform HEAD check for local branchesJeff King2017-07-091-1/+2
* | | | | | | | | | Merge branch 'ks/typofix-commit-c-comment' into maintJunio C Hamano2017-07-121-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/commit.c: fix a typo in the commentks/typofix-commit-c-commentKaartic Sivaraam2017-07-061-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |