summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | fetch-object: unify fetch_object[s] functionsJonathan Tan2018-09-134-19/+9
| |/ / / / / / /
* | | | | | | | Merge branch 'en/sequencer-empty-edit-result-aborts'Junio C Hamano2018-09-244-17/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | sequencer: fix --allow-empty-message behavior, make it smarterElijah Newren2018-09-134-17/+14
* | | | | | | | | Merge branch 'ds/reachable'Junio C Hamano2018-09-243-14/+79
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit-reach: fix memory and flag leaksDerrick Stolee2018-09-211-0/+5
| * | | | | | | | | commit-reach: properly peel tagsDerrick Stolee2018-09-213-14/+74
* | | | | | | | | | Merge branch 'nd/attr-pathspec-fix'Junio C Hamano2018-09-242-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add: do not accept pathspec magic 'attr'Nguyễn Thái Ngọc Duy2018-09-212-2/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bw/protocol-v2'Junio C Hamano2018-09-241-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: document value 2 for protocol.versionBrandon Williams2018-09-111-0/+2
* | | | | | | | | | | Merge branch 'sb/string-list-remove-unused'Junio C Hamano2018-09-242-18/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | string-list: remove unused function print_string_listStefan Beller2018-09-112-18/+0
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/dev-build-format-security'Junio C Hamano2018-09-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config.mak.dev: add -Wformat-securityJeff King2018-09-111-0/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'sg/t3701-tighten-trace'Junio C Hamano2018-09-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t3701-add-interactive: tighten the check of trace outputSZEDER Gábor2018-09-111-1/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sb/diff-color-move-more'Junio C Hamano2018-09-241-5/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff: fix --color-moved-ws=allow-indentation-changePhillip Wood2018-09-111-5/+6
* | | | | | | | | | | | Merge branch 'en/rerere-multi-stage-1-fix'Junio C Hamano2018-09-242-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rerere: avoid buffer overrunElijah Newren2018-09-112-2/+2
| * | | | | | | | | | | | t4200: demonstrate rerere segfault on specially crafted mergeElijah Newren2018-09-111-0/+29
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'js/mingw-o-append'Junio C Hamano2018-09-246-3/+129
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | mingw: fix mingw_open_append to work with named pipesJeff Hostetler2018-09-112-4/+34
| * | | | | | | | | | | | t0051: test GIT_TRACE to a windows named pipeJeff Hostetler2018-09-115-0/+96
* | | | | | | | | | | | | Merge branch 'en/double-semicolon-fix'Junio C Hamano2018-09-243-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove superfluous trailing semicolonsElijah Newren2018-09-053-3/+3
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/reopen-tempfile-truncate'Junio C Hamano2018-09-244-5/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | reopen_tempfile(): truncate opened fileJeff King2018-09-054-5/+23
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'bp/mv-submodules-with-fsmonitor'Junio C Hamano2018-09-241-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-mv: allow submodules and fsmonitor to work togetherBen Peart2018-09-121-2/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ds/format-patch-range-diff-test'Junio C Hamano2018-09-241-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t3206-range-diff.sh: cover single-patch caseDerrick Stolee2018-09-121-0/+5
* | | | | | | | | | | | | | Merge branch 'tb/void-check-attr'Junio C Hamano2018-09-249-69/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Make git_check_attr() a void functionTorsten Bögershausen2018-09-139-69/+57
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'js/rebase-i-autosquash-fix'Junio C Hamano2018-09-242-3/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase -i: be careful to wrap up fixup/squash chainsJohannes Schindelin2018-09-042-4/+15
| * | | | | | | | | | | | | | rebase -i --autosquash: demonstrate a problem skipping the last squashJohannes Schindelin2018-09-041-0/+19
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ab/fetch-tags-noclobber'Junio C Hamano2018-09-202-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fetch doc: correct grammar in --force docsÆvar Arnfjörð Bjarmason2018-09-201-2/+2
| * | | | | | | | | | | | | | push doc: add spacing between two wordsÆvar Arnfjörð Bjarmason2018-09-191-1/+1
* | | | | | | | | | | | | | | Merge branch 'bp/checkout-new-branch-optim'Junio C Hamano2018-09-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | config doc: add missing list separator for checkout.optimizeNewBranchÆvar Arnfjörð Bjarmason2018-09-191-1/+1
* | | | | | | | | | | | | | | | Initial batch post 2.19Junio C Hamano2018-09-172-2/+113
* | | | | | | | | | | | | | | | Merge branch 'nd/bisect-show-list-fix'Junio C Hamano2018-09-171-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | bisect.c: make show_list() build againNguyễn Thái Ngọc Duy2018-09-041-5/+5
* | | | | | | | | | | | | | | | | Merge branch 'ab/fetch-tags-noclobber'Junio C Hamano2018-09-177-35/+136
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fetch: stop clobbering existing tags without --forceÆvar Arnfjörð Bjarmason2018-08-314-14/+28
| * | | | | | | | | | | | | | | | fetch: document local ref updates with/without --forceÆvar Arnfjörð Bjarmason2018-08-312-10/+37
| * | | | | | | | | | | | | | | | push doc: correct lies about how push refspecs workÆvar Arnfjörð Bjarmason2018-08-312-11/+48
| * | | | | | | | | | | | | | | | push doc: move mention of "tag <tag>" later in the proseÆvar Arnfjörð Bjarmason2018-08-311-2/+2