Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence' | Junio C Hamano | 2015-01-07 | 2 | -1/+8 |
|\ | |||||
| * | strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines | Junio C Hamano | 2014-10-27 | 2 | -1/+8 |
* | | Merge branch 'jc/diff-b-m' | Junio C Hamano | 2015-01-07 | 3 | -3/+11 |
|\ \ | |||||
| * | | diff -B -M: fix output for "copy and then rewrite" case | Junio C Hamano | 2014-10-24 | 3 | -3/+11 |
* | | | Merge branch 'jc/clone-borrow' | Junio C Hamano | 2015-01-07 | 3 | -2/+46 |
|\ \ \ | |||||
| * | | | clone: --dissociate option to mark that reference is only temporary | Junio C Hamano | 2014-10-15 | 3 | -2/+46 |
| | |/ | |/| | |||||
* | | | Merge branch 'jc/checkout-local-track-report' | Junio C Hamano | 2015-01-07 | 2 | -11/+41 |
|\ \ \ | |||||
| * | | | checkout: report upstream correctly even with loosely defined branch.*.merge | Junio C Hamano | 2014-10-15 | 2 | -11/+41 |
* | | | | Merge branch 'for-junio' of git://bogomips.org/git-svn | Junio C Hamano | 2014-12-29 | 3 | -1/+181 |
|\ \ \ \ | |||||
| * | | | | git-svn: support for git-svn propset | Alfred Perlstein | 2014-12-09 | 3 | -1/+181 |
* | | | | | Merge branch 'jc/t9001-modernise' | Junio C Hamano | 2014-12-29 | 1 | -294/+287 |
|\ \ \ \ \ | |||||
| * | | | | | t9001: style modernisation phase #5 | Junio C Hamano | 2014-11-26 | 1 | -76/+74 |
| * | | | | | t9001: style modernisation phase #4 | Junio C Hamano | 2014-11-26 | 1 | -10/+10 |
| * | | | | | t9001: style modernisation phase #3 | Junio C Hamano | 2014-11-26 | 1 | -52/+47 |
| * | | | | | t9001: style modernisation phase #2 | Junio C Hamano | 2014-11-26 | 1 | -151/+151 |
| * | | | | | t9001: style modernisation phase #1 | Junio C Hamano | 2014-11-25 | 1 | -17/+17 |
* | | | | | | Merge branch 'mh/update-ref-verify' | Junio C Hamano | 2014-12-29 | 2 | -9/+97 |
|\ \ \ \ \ \ | |||||
| * | | | | | | update-ref: fix "verify" command with missing <oldvalue> | Michael Haggerty | 2014-12-11 | 2 | -11/+7 |
| * | | | | | | t1400: add some more tests of "update-ref --stdin"'s verify command | Michael Haggerty | 2014-12-11 | 1 | -0/+92 |
* | | | | | | | Sync with maint | Junio C Hamano | 2014-12-22 | 2 | -1/+34 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Prepare for 2.2.2 | Junio C Hamano | 2014-12-22 | 2 | -1/+34 |
| * | | | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maint | Junio C Hamano | 2014-12-22 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/no-perl-tests' into maint | Junio C Hamano | 2014-12-22 | 3 | -4/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | 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 needed | 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() | Justin Guenther | 2014-12-13 | 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_* variables | Jeff King | 2014-12-12 | 1 | -21/+5 |
| * | | | | | | | | | | | | | | | | | | | | | commit: loosen ident checks when generating template | Jeff King | 2014-12-12 | 1 | -9/+14 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/split-index' | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | index-format.txt: add a missing closing quote | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |