aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* The last minute bits of fixesJunio C Hamano2015-07-10
* Merge branch 'cb/rebase-am-exit-code'Junio C Hamano2015-07-10
|\
| * rebase: return non-zero error code if format-patch failsClemens Buchacher2015-07-08
* | Merge branch 'jk/fix-refresh-utime'Junio C Hamano2015-07-10
|\ \
| * | check_and_freshen_file: fix reversed success-checkJeff King2015-07-08
* | | Merge branch 'mm/branch-doc-updates'Junio C Hamano2015-07-10
|\ \ \
| * | | Documentation/branch: document -M and -D in terms of --forceMatthieu Moy2015-07-06
| * | | Documentation/branch: document -d --force and -m --forceMatthieu Moy2015-07-06
* | | | Merge branch 'ls/hint-rev-list-count'Junio C Hamano2015-07-10
|\ \ \ \
| * | | | rev-list: add --count to usage guideLawrence Siebert2015-07-01
* | | | | Merge branch 'jk/rev-list-no-bitmap-while-pruning'Junio C Hamano2015-07-10
|\ \ \ \ \
| * | | | | rev-list: disable --use-bitmap-index when pruning commitsJeff King2015-07-01
* | | | | | Merge branch 'cb/subtree-tests-update'Junio C Hamano2015-07-10
|\ \ \ \ \ \
| * | | | | | contrib/subtree: small tidy-up to testCharles Bailey2015-06-22
| * | | | | | contrib/subtree: fix broken &&-chains and revealed test errorCharles Bailey2015-06-22
| * | | | | | contrib/subtree: use tabs consitently for indentation in testsCharles Bailey2015-06-22
* | | | | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Junio C Hamano2015-07-10
|\ \ \ \ \ \ \
| * | | | | | | test-lib.sh: fix color support when tput needs ~/.terminfoRichard Hansen2015-06-17
| * | | | | | | Revert "test-lib.sh: do tests for color support after changing HOME"Richard Hansen2015-06-17
* | | | | | | | Merge branch 'sb/p5310-and-chain'Junio C Hamano2015-07-10
|\ \ \ \ \ \ \ \
| * | | | | | | | p5310: Fix broken && chain in performance testStefan Beller2015-06-26
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'tb/checkout-doc'Junio C Hamano2015-07-10
|\ \ \ \ \ \ \ \
| * | | | | | | | git-checkout.txt: document "git checkout <pathspec>" betterTorsten Bögershausen2015-06-17
* | | | | | | | | Merge branch 'jk/pretty-encoding-doc'Junio C Hamano2015-07-10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs: clarify that --encoding can produce invalid sequencesJeff King2015-06-17
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2015-07-10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add tests for wildcard "path vs ref" disambiguationNguyễn Thái Ngọc Duy2015-07-01
* | | | | | | | | | Merge branch 'jk/maint-for-each-packed-object'Junio C Hamano2015-07-09
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | for_each_packed_object: automatically open pack indexJeff King2015-06-22
* | | | | | | | | | | Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'Junio C Hamano2015-07-09
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-pack: fix allocation of sorted_by_pos arrayJunio C Hamano2015-07-04
* | | | | | | | | | | | git-multimail: update to release 1.1.1Matthieu Moy2015-07-06
* | | | | | | | | | | | Git 2.5.0-rc1v2.5.0-rc1Junio C Hamano2015-07-01
* | | | | | | | | | | | Merge branch 'me/fetch-into-shallow-safety'Junio C Hamano2015-07-01
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fetch-pack: check for shallow if depth givenMike Edgar2015-06-17
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/prompt-document-ps1-state-separator'Junio C Hamano2015-07-01
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-prompt.sh: document GIT_PS1_STATESEPARATORJoe Cridge2015-06-10
* | | | | | | | | | | | | Merge branch 'mm/describe-doc'Junio C Hamano2015-07-01
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation/describe: improve one-line summaryMatthieu Moy2015-06-16
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'da/mergetool-winmerge'Junio C Hamano2015-07-01
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mergetool-lib: fix default tool selectionMichael J Gruber2015-06-19
* | | | | | | | | | | | | | Sync with maintJunio C Hamano2015-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/array-size' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | Git 2.5.0-rc0v2.5.0-rc0Junio C Hamano2015-06-25
* | | | | | | | | | | | | | | | Merge branch 'cn/cvsimport-perl-update'Junio C Hamano2015-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | cvsimport: silence regex warning appearing in Perl 5.22.Christian Neukirchen2015-06-24
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'cb/array-size'Junio C Hamano2015-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix definition of ARRAY_SIZE for non-gcc buildsCharles Bailey2015-06-24
* | | | | | | | | | | | | | | | Sync with 2.4.5Junio C Hamano2015-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |