summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'Junio C Hamano2015-01-072-1/+8
|\
| * strbuf_add_commented_lines(): avoid SP-HT sequence in commented linesJunio C Hamano2014-10-272-1/+8
* | Merge branch 'jc/diff-b-m'Junio C Hamano2015-01-073-3/+11
|\ \
| * | diff -B -M: fix output for "copy and then rewrite" caseJunio C Hamano2014-10-243-3/+11
* | | Merge branch 'jc/clone-borrow'Junio C Hamano2015-01-073-2/+46
|\ \ \
| * | | clone: --dissociate option to mark that reference is only temporaryJunio C Hamano2014-10-153-2/+46
| | |/ | |/|
* | | Merge branch 'jc/checkout-local-track-report'Junio C Hamano2015-01-072-11/+41
|\ \ \
| * | | checkout: report upstream correctly even with loosely defined branch.*.mergeJunio C Hamano2014-10-152-11/+41
* | | | Merge branch 'for-junio' of git://bogomips.org/git-svnJunio C Hamano2014-12-293-1/+181
|\ \ \ \
| * | | | git-svn: support for git-svn propsetAlfred Perlstein2014-12-093-1/+181
* | | | | Merge branch 'jc/t9001-modernise'Junio C Hamano2014-12-291-294/+287
|\ \ \ \ \
| * | | | | t9001: style modernisation phase #5Junio C Hamano2014-11-261-76/+74
| * | | | | t9001: style modernisation phase #4Junio C Hamano2014-11-261-10/+10
| * | | | | t9001: style modernisation phase #3Junio C Hamano2014-11-261-52/+47
| * | | | | t9001: style modernisation phase #2Junio C Hamano2014-11-261-151/+151
| * | | | | t9001: style modernisation phase #1Junio C Hamano2014-11-251-17/+17
* | | | | | Merge branch 'mh/update-ref-verify'Junio C Hamano2014-12-292-9/+97
|\ \ \ \ \ \
| * | | | | | update-ref: fix "verify" command with missing <oldvalue>Michael Haggerty2014-12-112-11/+7
| * | | | | | t1400: add some more tests of "update-ref --stdin"'s verify commandMichael Haggerty2014-12-111-0/+92
* | | | | | | 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 neededRené 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()Justin Guenther2014-12-131-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_* variablesJeff King2014-12-121-21/+5
| * | | | | | | | | | | | | | | | | | | | | commit: loosen ident checks when generating templateJeff King2014-12-121-9/+14
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/split-index'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | index-format.txt: add a missing closing quoteNguyễn Thái Ngọc Duy2014-12-111-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-asan'Junio C Hamano2014-12-222-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \