Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'po/everyday-doc' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-simple' into maint | Junio C Hamano | 2014-12-22 | 2 | -6/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/config-flip-xbit-back-after-checking' into maint | Junio C Hamano | 2014-12-22 | 2 | -1/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/receive-pack-use-labs' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/maint-config-use-labs' into maint | Junio C Hamano | 2014-12-22 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/windows-open-eisdir-error' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/colors-fix' into maint | Junio C Hamano | 2014-12-22 | 3 | -14/+25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/checkout-from-tree' into maint | Junio C Hamano | 2014-12-22 | 2 | -0/+35 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | clean: typofix | Alexander Kuleshov | 2014-12-22 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Third batch for 2.3 cycle | Junio C Hamano | 2014-12-22 | 1 | -2/+93 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-complete-line' | Junio C Hamano | 2014-12-22 | 3 | -7/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | use strbuf_complete_line() for adding a newline if neededrs/use-strbuf-complete-line | René Scharfe | 2014-12-12 | 3 | -7/+3 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jg/prompt-localize-temporary' | Junio C Hamano | 2014-12-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | git-prompt.sh: make $f local to __git_eread()jg/prompt-localize-temporary | Justin Guenther | 2014-12-12 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ch/new-gpg-drops-rfc-1991' | Junio C Hamano | 2014-12-22 | 8 | -15/+126 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | tests: make comment on GPG keyring match the code | Christian Hesse | 2014-12-16 | 1 | -3/+13 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | tests: squelch noise from GPG machinery set-up | Junio C Hamano | 2014-12-12 | 1 | -12/+14 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | tests: replace binary GPG keyrings with ASCII-armored keys | Christian Hesse | 2014-12-12 | 4 | -2/+89 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | tests: skip RFC1991 tests for gnupg 2.1 | Christian Hesse | 2014-12-12 | 2 | -7/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | tests: create gpg homedir on the fly | Christian Hesse | 2014-12-12 | 4 | -3/+11 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/commit-date-approxidate' | Junio C Hamano | 2014-12-22 | 1 | -30/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | commit: always populate GIT_AUTHOR_* variablesjk/commit-date-approxidate | Jeff King | 2014-12-11 | 1 | -21/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | commit: loosen ident checks when generating template | Jeff King | 2014-12-11 | 1 | -9/+14 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/split-index' | Junio C Hamano | 2014-12-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | index-format.txt: add a missing closing quotend/split-index | Nguyễn Thái Ngọc Duy | 2014-12-11 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-asan' | Junio C Hamano | 2014-12-22 | 2 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t: support clang/gcc AddressSanitizerjk/test-asan | Jeff King | 2014-12-11 | 2 | -0/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ok/rebase-i-count-todo' | Junio C Hamano | 2014-12-22 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show number of TODO items for interactive rebaseok/rebase-i-count-todo | Onno Kortmann | 2014-12-10 | 1 | -1/+3 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/read-packed-refs-without-path-max' | Junio C Hamano | 2014-12-22 | 1 | -21/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_packed_refs: use skip_prefix instead of static arrayjk/read-packed-refs-without-path-max | Jeff King | 2014-12-10 | 1 | -3/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_packed_refs: pass strbuf to parse_ref_line | Jeff King | 2014-12-10 | 1 | -12/+15 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_packed_refs: use a strbuf for reading lines | Jeff King | 2014-12-10 | 1 | -9/+11 | |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/always-allow-large-packets' | Junio C Hamano | 2014-12-22 | 2 | -18/+52 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | pkt-line: allow writing of LARGE_PACKET_MAX buffersjk/always-allow-large-packets | Jeff King | 2014-12-10 | 2 | -18/+52 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/colors' | Junio C Hamano | 2014-12-22 | 6 | -54/+250 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | parse_color: drop COLOR_BACKGROUND macro | Jeff King | 2014-12-09 | 1 | -5/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: allow configurable colors | Jeff King | 2014-11-20 | 2 | -13/+90 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | parse_color: recognize "no$foo" to clear the $foo attribute | Jeff King | 2014-11-20 | 4 | -6/+20 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | parse_color: support 24-bit RGB values | Jeff King | 2014-11-20 | 4 | -5/+37 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | parse_color: refactor color storage | Jeff King | 2014-11-20 | 1 | -32/+106 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/parse-config-slot' into jk/colors | Junio C Hamano | 2014-11-20 | 13 | -50/+47 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rw/apply-does-not-take-ignore-date' | Junio C Hamano | 2014-12-22 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-am.txt: --ignore-date flag is not passed to git-applyrw/apply-does-not-take-ignore-date | Ronald Wampler | 2014-12-09 | 1 | -1/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/test-hashmap-squelch-gcc' | Junio C Hamano | 2014-12-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-hashmap: squelch gcc compiler warningjs/test-hashmap-squelch-gcc | Johannes Schindelin | 2014-12-09 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/fsck-tag-validation' | Junio C Hamano | 2014-12-22 | 4 | -6/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index-pack: terminate object buffers with NULjs/fsck-tag-validation | Duy Nguyen | 2014-12-09 | 2 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: properly bound "invalid tag name" error message | Jeff King | 2014-12-09 | 2 | -3/+8 |