summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a regression test for 'git remote add <existing> <same-url>'js/remote-add-with-insteadofJohannes Schindelin2014-12-231-0/+5
* git remote: allow adding remotes agreeing with url.<...>.insteadOfJohannes Schindelin2014-12-231-1/+3
* Sync with maintJunio C Hamano2014-12-222-1/+34
|\
| * Prepare for 2.2.2Junio C Hamano2014-12-222-1/+34
| * Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maintJunio C Hamano2014-12-221-4/+10
| |\
| * \ Merge branch 'jk/no-perl-tests' into maintJunio C Hamano2014-12-223-4/+4
| |\ \
| * \ \ Merge branch 'po/everyday-doc' into maintJunio C Hamano2014-12-221-1/+1
| |\ \ \
| * \ \ \ Merge branch 'jk/push-simple' into maintJunio C Hamano2014-12-222-6/+34
| |\ \ \ \
| * \ \ \ \ Merge branch 'mh/config-flip-xbit-back-after-checking' into maintJunio C Hamano2014-12-222-1/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maintJunio C Hamano2014-12-221-1/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/receive-pack-use-labs' into maintJunio C Hamano2014-12-221-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/maint-config-use-labs' into maintJunio C Hamano2014-12-221-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/windows-open-eisdir-error' into maintJunio C Hamano2014-12-221-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-223-14/+25
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/checkout-from-tree' into maintJunio C Hamano2014-12-222-0/+35
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clean: typofixAlexander Kuleshov2014-12-221-1/+1
* | | | | | | | | | | | | Third batch for 2.3 cycleJunio C Hamano2014-12-221-2/+93
* | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \