summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/use-strbuf-complete-line'Junio C Hamano2014-12-223-7/+3
|\
| * use strbuf_complete_line() for adding a newline if neededrs/use-strbuf-complete-lineRené Scharfe2014-12-123-7/+3
* | Merge branch 'jg/prompt-localize-temporary'Junio C Hamano2014-12-221-1/+1
|\ \
| * | git-prompt.sh: make $f local to __git_eread()jg/prompt-localize-temporaryJustin Guenther2014-12-121-1/+1
* | | Merge branch 'ch/new-gpg-drops-rfc-1991'Junio C Hamano2014-12-228-15/+126
|\ \ \
| * | | tests: make comment on GPG keyring match the codeChristian Hesse2014-12-161-3/+13
| * | | tests: squelch noise from GPG machinery set-upJunio C Hamano2014-12-121-12/+14
| * | | tests: replace binary GPG keyrings with ASCII-armored keysChristian Hesse2014-12-124-2/+89
| * | | tests: skip RFC1991 tests for gnupg 2.1Christian Hesse2014-12-122-7/+11
| * | | tests: create gpg homedir on the flyChristian Hesse2014-12-124-3/+11
* | | | Merge branch 'jk/commit-date-approxidate'Junio C Hamano2014-12-221-30/+18
|\ \ \ \
| * | | | commit: always populate GIT_AUTHOR_* variablesjk/commit-date-approxidateJeff King2014-12-111-21/+5
| * | | | commit: loosen ident checks when generating templateJeff King2014-12-111-9/+14
* | | | | Merge branch 'nd/split-index'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \
| * | | | | index-format.txt: add a missing closing quotend/split-indexNguyễn Thái Ngọc Duy2014-12-111-1/+1
* | | | | | Merge branch 'jk/test-asan'Junio C Hamano2014-12-222-0/+4
|\ \ \ \ \ \
| * | | | | | t: support clang/gcc AddressSanitizerjk/test-asanJeff King2014-12-112-0/+4
* | | | | | | Merge branch 'ok/rebase-i-count-todo'Junio C Hamano2014-12-221-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Show number of TODO items for interactive rebaseok/rebase-i-count-todoOnno Kortmann2014-12-101-1/+3
| |/ / / / / /
* | | | | | | Merge branch 'jk/read-packed-refs-without-path-max'Junio C Hamano2014-12-221-21/+25
|\ \ \ \ \ \ \
| * | | | | | | read_packed_refs: use skip_prefix instead of static arrayjk/read-packed-refs-without-path-maxJeff King2014-12-101-3/+2
| * | | | | | | read_packed_refs: pass strbuf to parse_ref_lineJeff King2014-12-101-12/+15
| * | | | | | | read_packed_refs: use a strbuf for reading linesJeff King2014-12-101-9/+11
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jk/always-allow-large-packets'Junio C Hamano2014-12-222-18/+52
|\ \ \ \ \ \ \
| * | | | | | | pkt-line: allow writing of LARGE_PACKET_MAX buffersjk/always-allow-large-packetsJeff King2014-12-102-18/+52
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/colors'Junio C Hamano2014-12-226-54/+250
|\ \ \ \ \ \ \
| * | | | | | | parse_color: drop COLOR_BACKGROUND macroJeff King2014-12-091-5/+4
| * | | | | | | diff-highlight: allow configurable colorsJeff King2014-11-202-13/+90
| * | | | | | | parse_color: recognize "no$foo" to clear the $foo attributeJeff King2014-11-204-6/+20
| * | | | | | | parse_color: support 24-bit RGB valuesJeff King2014-11-204-5/+37
| * | | | | | | parse_color: refactor color storageJeff King2014-11-201-32/+106
| * | | | | | | Merge branch 'jn/parse-config-slot' into jk/colorsJunio C Hamano2014-11-2013-50/+47
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'rw/apply-does-not-take-ignore-date'Junio C Hamano2014-12-221-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-am.txt: --ignore-date flag is not passed to git-applyrw/apply-does-not-take-ignore-dateRonald Wampler2014-12-091-1/+0
* | | | | | | | | | Merge branch 'js/test-hashmap-squelch-gcc'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-hashmap: squelch gcc compiler warningjs/test-hashmap-squelch-gccJohannes Schindelin2014-12-091-1/+1
* | | | | | | | | | | Merge branch 'js/fsck-tag-validation'Junio C Hamano2014-12-224-6/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-pack: terminate object buffers with NULjs/fsck-tag-validationDuy Nguyen2014-12-092-3/+3
| * | | | | | | | | | | fsck: properly bound "invalid tag name" error messageJeff King2014-12-092-3/+8
* | | | | | | | | | | | Merge branch 'po/doc-assume-unchanged'Junio C Hamano2014-12-222-14/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitignore.txt: do not suggest assume-unchangedpo/doc-assume-unchangedMichael J Gruber2014-12-091-4/+0
| * | | | | | | | | | | | doc: make clear --assume-unchanged's user contractPhilip Oakley2014-12-091-10/+8
* | | | | | | | | | | | | Merge branch 'mg/branch-d-m-f'Junio C Hamano2014-12-222-4/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | branch: allow -f with -m and -dmg/branch-d-m-fMichael J Gruber2014-12-092-4/+14
| * | | | | | | | | | | | | t3200-branch: test -MMichael J Gruber2014-12-041-0/+9
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'tb/t0027-eol-conversion'Junio C Hamano2014-12-221-16/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t0027: check the eol conversion warningstb/t0027-eol-conversionTorsten Bögershausen2014-12-051-16/+66
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/for-each-reflog-ent-reverse'Junio C Hamano2014-12-222-12/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | for_each_reflog_ent_reverse: turn leftover check into assertionjk/for-each-reflog-ent-reverseJeff King2014-12-051-1/+1
| * | | | | | | | | | | | | for_each_reflog_ent_reverse: fix newlines on block boundariesJeff King2014-12-052-11/+66