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
* | | | | | | | | | | | | | Git 2.3.0-rc0v2.3.0-rc0Junio C Hamano2015-01-122-1/+18
* | | | | | | | | | | | | | Sync with 2.2.2Junio C Hamano2015-01-122-1/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Git 2.2.2v2.2.2Junio C Hamano2015-01-123-2/+33
| * | | | | | | | | | | | | | Merge branch 'jk/read-packed-refs-without-path-max' into maintJunio C Hamano2015-01-121-21/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano2015-01-122-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/find-uniq-abbrev' into maintJunio C Hamano2015-01-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maintJunio C Hamano2015-01-122-9/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rw/apply-does-not-take-ignore-date' into maintJunio C Hamano2015-01-121-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/for-each-reflog-ent-reverse' into maintJunio C Hamano2015-01-122-12/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'Junio C Hamano2015-01-129-7/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | pack-objects: use --objects-edge-aggressive for shallow reposbc/fetch-thin-less-aggressive-in-normal-repositorybrian m. carlson2014-12-295-4/+20
| * | | | | | | | | | | | | | | | | | | | rev-list: add an option to mark fewer edges as uninterestingbrian m. carlson2014-12-296-4/+16
| * | | | | | | | | | | | | | | | | | | | Documentation: add missing article in rev-list-options.txtbrian m. carlson2014-12-221-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/doc-submitting-patches-keep-notes'Junio C Hamano2015-01-121-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | SubmittingPatches: explain rationale for using --notes with format-patchsb/doc-submitting-patches-keep-notesEric Sunshine2015-01-071-2/+5
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/simplify-transport-get'Junio C Hamano2015-01-121-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | transport: simplify duplicating a substring in transport_get() using xmemdupz()rs/simplify-transport-getRené Scharfe2014-12-291-3/+1
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/simplify-parsing-commit-tree-S'Junio C Hamano2015-01-121-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | commit-tree: simplify parsing of option -S using skip_prefix()rs/simplify-parsing-commit-tree-SRené Scharfe2014-12-291-3/+1
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/plug-strbuf-leak-in-merge'Junio C Hamano2015-01-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | merge: release strbuf after use in suggest_conflicts()rs/plug-strbuf-leak-in-mergeRené Scharfe2014-12-291-0/+1
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/plug-strbuf-leak-in-lock-ref'Junio C Hamano2015-01-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | refs: plug strbuf leak in lock_ref_sha1_basic()rs/plug-strbuf-leak-in-lock-refRené Scharfe2014-12-291-1/+1
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'es/checkout-index-temp'Junio C Hamano2015-01-122-203/+213
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | checkout-index: fix --temp relative path manglinges/checkout-index-tempEric Sunshine2014-12-292-9/+9
| * | | | | | | | | | | | | | | | | | | | | t2004: demonstrate broken relative path printingEric Sunshine2014-12-291-0/+12
| * | | | | | | | | | | | | | | | | | | | | t2004: standardize file naming in symlink testEric Sunshine2014-12-291-3/+3
| * | | | | | | | | | | | | | | | | | | | | t2004: drop unnecessary write-tree/read-treeEric Sunshine2014-12-291-3/+0
| * | | | | | | | | | | | | | | | | | | | | t2004: modernize styleEric Sunshine2014-12-291-195/+196
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/bisect-rev-parsing'Junio C Hamano2015-01-122-4/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | bisect: add test to check that revs are properly parsedcc/bisect-rev-parsingChristian Couder2014-12-291-0/+9
| * | | | | | | | | | | | | | | | | | | | | bisect: parse revs before passing them to check_expected_revs()Christian Couder2014-12-291-4/+7
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Fourth batch for 2.3 cycleJunio C Hamano2015-01-071-0/+82
* | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2015-01-072-12/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'maint-2.1' into maintJunio C Hamano2015-01-072-12/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'maint-2.0' into maint-2.1maint-2.1Junio C Hamano2015-01-072-12/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge branch 'maint-1.9' into maint-2.0maint-2.0Junio C Hamano2015-01-072-12/+35
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge branch 'maint-1.8.5' into maint-1.9maint-1.9Junio C Hamano2015-01-072-12/+35
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5Junio C Hamano2015-01-072-12/+35
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5Jeff King2014-12-292-12/+35
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/maint-0090-awk-tweak'Junio C Hamano2015-01-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | t0090: tweak awk statement for Solaris /usr/xpg4/bin/awkbw/maint-0090-awk-tweakBen Walton2014-12-231-1/+1
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/pre-push-sample-no-custom-ifs'Junio C Hamano2015-01-071-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | pre-push.sample: remove unnecessary and misleading IFS=' 'jh/pre-push-sample-no-custom-ifsJim Hill2014-12-221-1/+0
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tf/prompt-preserve-exit-status'Junio C Hamano2015-01-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | git-prompt: preserve value of $? inside shell promptTony Finch2014-12-221-0/+4
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/dco-indentation-fix'Junio C Hamano2015-01-071-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Documentation/SubmittingPatches: unify whitespace/tabs for the DCOsb/dco-indentation-fixStefan Beller2014-12-221-6/+6