summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/conf-var-doc' into maintJunio C Hamano2015-03-052-8/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'av/wincred-with-at-in-username-fix' into maintJunio C Hamano2015-03-051-3/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ch/new-gpg-drops-rfc-1991' into maintJunio C Hamano2015-03-052-0/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/remote-set-url-doc' into maintJunio C Hamano2015-03-051-6/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-bitmap' into maintJunio C Hamano2015-03-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-no-ungetc-eof' into maintJunio C Hamano2015-03-052-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/decimal-width-for-uintmax' into maintJunio C Hamano2015-03-052-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/push-cert' into maintJunio C Hamano2015-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/deref-symref-over-helper-transport' into maintJunio C Hamano2015-03-053-6/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/rebase-i-abbrev' into maintJunio C Hamano2015-03-052-9/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dp/remove-duplicated-header-inclusion' into maintJunio C Hamano2015-03-054-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maintJunio C Hamano2015-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/git-pm-typofix' into maintJunio C Hamano2015-03-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/sanity' into maintJunio C Hamano2015-03-054-9/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #7)Junio C Hamano2015-03-051-0/+20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/svn-fixes'Junio C Hamano2015-03-055-20/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'svn-maint-fixes' into svn-fixesJunio C Hamano2015-02-263-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn: lazy load some modulesEric Wong2015-02-265-20/+26
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/svn-maint-fixes'Junio C Hamano2015-03-053-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git::SVN::*: avoid premature FileHandle closureew/svn-maint-fixesKyle J. McKay2015-02-262-0/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn: fix localtime=true on non-glibc environmentsRyuichi Kokubo2015-02-261-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/connect-ipv6-parse-fix'Junio C Hamano2015-03-053-80/+144
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5500: show user name and host in diag-urlTorsten Bögershausen2015-02-222-30/+56
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5601: add more test cases for IPV6Torsten Bögershausen2015-02-221-17/+40
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connect.c: allow ssh://user@[2001:db8::1]/repo.gitTorsten Bögershausen2015-02-222-26/+39
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-test-updates'Junio C Hamano2015-03-0511-175/+550
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_ln_s_add: refresh stat info of fake symbolic linksjc/diff-test-updatesJohannes Sixt2015-02-231-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4008: modernise styleJunio C Hamano2015-02-151-160/+126
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/diff-lib: check exact object names in compare_diff_rawJunio C Hamano2015-02-151-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: do not borrow from COPYING and README from the real sourceJunio C Hamano2015-02-157-26/+433
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4010: correct expected object namesJunio C Hamano2015-02-151-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9300: correct expected object namesJunio C Hamano2015-02-151-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4008: correct stale commentsJunio C Hamano2015-02-151-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/simple-cleanups'Junio C Hamano2015-03-054-13/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1_name: use strlcpy() to copy stringsrs/simple-cleanupsRené Scharfe2015-02-221-6/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: use starts_with() to check for a prefixRené Scharfe2015-02-221-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for-each-ref: use skip_prefix() to avoid duplicate string comparisonRené Scharfe2015-02-221-4/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connect: use strcmp() for string comparisonRené Scharfe2015-02-221-2/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/no-xopen-source-for-cygwin'Junio C Hamano2015-03-051-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-compat-util.h: remove redundant coderj/no-xopen-source-for-cygwinRamsay Jones2015-02-221-6/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/am-c-doc'Junio C Hamano2015-03-052-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-am.txt: mention mailinfo.scissors config variablemm/am-c-docMatthieu Moy2015-02-201-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/config.txt: document mailinfo.scissorsMatthieu Moy2015-02-201-0/+7
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/refs-have-new'Junio C Hamano2015-03-0514-106/+233
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs.h: remove duplication in function docstringsmh/refs-have-newMichael Haggerty2015-02-171-23/+43
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_ref(): improve documentationMichael Haggerty2015-02-172-7/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref_transaction_verify(): new function to check a reference's valueMichael Haggerty2015-02-173-21/+67
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref_transaction_delete(): check that old_sha1 is not null_sha1Michael Haggerty2015-02-171-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref_transaction_create(): check that new_sha1 is validMichael Haggerty2015-02-171-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: avoid race when creating orphan commitsMichael Haggerty2015-02-172-2/+2