aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | t9001: style modernisation phase #2Junio C Hamano2014-11-25
| * | | | | | | | | | | | | | t9001: style modernisation phase #1Junio C Hamano2014-11-25
* | | | | | | | | | | | | | | Merge branch 'mh/update-ref-verify'Junio C Hamano2014-12-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | update-ref: fix "verify" command with missing <oldvalue>Michael Haggerty2014-12-11
| * | | | | | | | | | | | | | | t1400: add some more tests of "update-ref --stdin"'s verify commandMichael Haggerty2014-12-11
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Sync with maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Prepare for 2.2.2Junio C Hamano2014-12-22
| * | | | | | | | | | | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/no-perl-tests' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'po/everyday-doc' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-simple' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/config-flip-xbit-back-after-checking' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/receive-pack-use-labs' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/maint-config-use-labs' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/windows-open-eisdir-error' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/checkout-from-tree' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | clean: typofixAlexander Kuleshov2014-12-22
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Third batch for 2.3 cycleJunio C Hamano2014-12-22
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-complete-line'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | use strbuf_complete_line() for adding a newline if neededRené Scharfe2014-12-12
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jg/prompt-localize-temporary'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | git-prompt.sh: make $f local to __git_eread()Justin Guenther2014-12-12
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ch/new-gpg-drops-rfc-1991'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | tests: make comment on GPG keyring match the codeChristian Hesse2014-12-16
| * | | | | | | | | | | | | | | | | | | | | | | | | | tests: squelch noise from GPG machinery set-upJunio C Hamano2014-12-12
| * | | | | | | | | | | | | | | | | | | | | | | | | | tests: replace binary GPG keyrings with ASCII-armored keysChristian Hesse2014-12-12
| * | | | | | | | | | | | | | | | | | | | | | | | | | tests: skip RFC1991 tests for gnupg 2.1Christian Hesse2014-12-12
| * | | | | | | | | | | | | | | | | | | | | | | | | | tests: create gpg homedir on the flyChristian Hesse2014-12-12
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/commit-date-approxidate'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | commit: always populate GIT_AUTHOR_* variablesJeff King2014-12-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | commit: loosen ident checks when generating templateJeff King2014-12-11
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/split-index'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | index-format.txt: add a missing closing quoteNguyễn Thái Ngọc Duy2014-12-11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-asan'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t: support clang/gcc AddressSanitizerJeff King2014-12-11
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ok/rebase-i-count-todo'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Show number of TODO items for interactive rebaseOnno Kortmann2014-12-10
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/read-packed-refs-without-path-max'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | read_packed_refs: use skip_prefix instead of static arrayJeff King2014-12-10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | read_packed_refs: pass strbuf to parse_ref_lineJeff King2014-12-10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | read_packed_refs: use a strbuf for reading linesJeff King2014-12-10
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/always-allow-large-packets'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | pkt-line: allow writing of LARGE_PACKET_MAX buffersJeff King2014-12-10
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/colors'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | parse_color: drop COLOR_BACKGROUND macroJeff King2014-12-09
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: allow configurable colorsJeff King2014-11-20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | parse_color: recognize "no$foo" to clear the $foo attributeJeff King2014-11-20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | parse_color: support 24-bit RGB valuesJeff King2014-11-20