summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'sb/checkout-explit-detach-no-advice'Junio C Hamano2016-08-192-1/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-adviceStefan Beller2016-08-152-1/+25
| |/ / / / / / / /
* | | | | | | | | Merge branch 'tb/t0027-raciness-fix'Junio C Hamano2016-08-192-43/+60
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | convert: Correct NNO tests and missing `LF will be replaced by CRLF`tb/t0027-raciness-fixTorsten Bögershausen2016-08-142-43/+60
* | | | | | | | | | Merge branch 'rs/pull-signed-tag'Junio C Hamano2016-08-194-12/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit: use FLEX_ARRAY in struct merge_remote_descrs/pull-signed-tagRené Scharfe2016-08-132-3/+2
| * | | | | | | | | | merge-recursive: fix verbose output for multiple base treesRené Scharfe2016-08-132-4/+19
| * | | | | | | | | | commit: factor out set_merge_remote_desc()René Scharfe2016-08-132-7/+14
| * | | | | | | | | | commit: use xstrdup() in get_merge_parent()René Scharfe2016-08-131-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | RelNotes: final batch of topics before -rc1Junio C Hamano2016-08-171-0/+13
* | | | | | | | | | Merge branch 'js/test-lint-pathname'Junio C Hamano2016-08-171-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t/Makefile: ensure that paths are valid on platforms we carejs/test-lint-pathnameJohannes Schindelin2016-08-161-1/+10
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'sg/reflog-past-root'Junio C Hamano2016-08-171-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t1410: remove superfluous 'git reflog' from the 'walk past root' testsg/reflog-past-rootSZEDER Gábor2016-08-151-1/+0
* | | | | | | | | | | Merge branch 'rs/mailinfo-lib'Junio C Hamano2016-08-171-7/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mailinfo: recycle strbuf in check_header()rs/mailinfo-libRené Scharfe2016-08-131-7/+2
* | | | | | | | | | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-08-172-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | receive-pack: use FLEX_ALLOC_MEM in queue_command()René Scharfe2016-08-131-3/+1
| * | | | | | | | | | | | correct FLEXPTR_* example in commentRené Scharfe2016-08-131-1/+1
* | | | | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-08-173-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t7411: become resilient to GETTEXT_POISONVasco Almeida2016-08-121-1/+1
| * | | | | | | | | | | | | t5520: become resilient to GETTEXT_POISONVasco Almeida2016-08-121-2/+2
| * | | | | | | | | | | | | t3404: become resilient to GETTEXT_POISONVasco Almeida2016-08-121-1/+1
* | | | | | | | | | | | | | git-multimail: update to release 1.4.0Matthieu Moy2016-08-176-276/+725
* | | | | | | | | | | | | | relnotes: redo the description of text=auto fixJunio C Hamano2016-08-171-5/+4
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Relnotes: decribe the updates to the "text=auto" attributeJunio C Hamano2016-08-151-0/+9
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Git 2.10-rc0v2.10.0-rc0Junio C Hamano2016-08-142-13/+11
|/ / / / / / / / / / /
* | | | | | | | | | | Sync with 2.9.3Junio C Hamano2016-08-122-1/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Git 2.9.3v2.9.3Junio C Hamano2016-08-123-2/+13
| * | | | | | | | | | Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2016-08-122-59/+41
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reset-ident-time-per-commit' into maintJunio C Hamano2016-08-123-0/+8
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Final batch before 2.10-rc0Junio C Hamano2016-08-121-2/+36
* | | | | | | | | | | | | Merge branch 'kw/patch-ids-optim'Junio C Hamano2016-08-128-87/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | rebase: avoid computing unnecessary patch IDsKevin Willford2016-08-115-8/+85
| * | | | | | | | | | | | patch-ids: add flag to create the diff patch id using header only dataKevin Willford2016-07-293-8/+12
| * | | | | | | | | | | | patch-ids: replace the seen indicator with a commit pointerKevin Willford2016-07-293-16/+5
| * | | | | | | | | | | | patch-ids: stop using a hand-rolled hashmap implementationKevin Willford2016-07-292-61/+32
* | | | | | | | | | | | | Merge branch 'ew/http-backend-batch-headers'Junio C Hamano2016-08-121-104/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | http-backend: buffer headers before sendingew/http-backend-batch-headersEric Wong2016-08-101-104/+116
* | | | | | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-08-123-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | i18n: git-stash: mark messages for translationVasco Almeida2016-08-101-2/+2
| * | | | | | | | | | | | | | i18n: archive: mark errors for translationVasco Almeida2016-08-091-5/+5
| * | | | | | | | | | | | | | i18n: setup: mark error messages for translationVasco Almeida2016-08-091-9/+9
* | | | | | | | | | | | | | | Merge branch 'vs/typofix'Junio C Hamano2016-08-1225-33/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Spelling fixesvs/typofixVille Skyttä2016-08-1125-33/+33
* | | | | | | | | | | | | | | | Merge branch 'js/mv-dir-to-new-directory'Junio C Hamano2016-08-121-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git mv: do not keep slash in `git mv dir non-existing-dir/`js/mv-dir-to-new-directoryJohannes Schindelin2016-08-081-4/+7
* | | | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-add-unique-abbrev'Junio C Hamano2016-08-123-16/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | use strbuf_add_unique_abbrev() for adding short hashesrs/use-strbuf-add-unique-abbrevRené Scharfe2016-08-063-16/+11
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jk/big-and-future-archive-tar'Junio C Hamano2016-08-121-10/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \