summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t3901: test git-am encoding conversionpt/am-testsPaul Tan2015-07-201-0/+62
* t3418: non-interactive rebase --continue with rerere enabledPaul Tan2015-07-201-0/+19
* t4150: tests for am --[no-]scissorsPaul Tan2015-07-201-0/+48
* t4150: am with post-applypatch hookPaul Tan2015-07-201-0/+38
* t4150: am with pre-applypatch hookPaul Tan2015-07-201-0/+33
* t4150: am with applypatch-msg hookPaul Tan2015-07-201-0/+35
* t4150: am --resolved fails if index has unmerged entriesPaul Tan2015-07-201-0/+13
* t4150: am --resolved fails if index has no changesPaul Tan2015-07-201-0/+12
* t4150: am refuses patches when pausedPaul Tan2015-07-201-0/+14
* t4151: am --abort will keep dirty index intactPaul Tan2015-07-201-0/+15
* t4150: am fails if index is dirtyPaul Tan2015-07-201-0/+12
* t4150: am.messageid really adds the message idPaul Tan2015-07-071-0/+12
* Git 2.5.0-rc1v2.5.0-rc1Junio C Hamano2015-07-012-1/+8
* Merge branch 'me/fetch-into-shallow-safety'Junio C Hamano2015-07-011-1/+1
|\
| * fetch-pack: check for shallow if depth givenme/fetch-into-shallow-safetyMike Edgar2015-06-171-1/+1
* | Merge branch 'jc/prompt-document-ps1-state-separator'Junio C Hamano2015-07-011-0/+4
|\ \
| * | git-prompt.sh: document GIT_PS1_STATESEPARATORjc/prompt-document-ps1-state-separatorJoe Cridge2015-06-101-0/+4
* | | Merge branch 'mm/describe-doc'Junio C Hamano2015-07-011-1/+1
|\ \ \
| * | | Documentation/describe: improve one-line summarymm/describe-docMatthieu Moy2015-06-161-1/+1
* | | | Merge branch 'da/mergetool-winmerge'Junio C Hamano2015-07-011-0/+1
|\ \ \ \
| * | | | mergetool-lib: fix default tool selectionda/mergetool-winmergeMichael J Gruber2015-06-191-0/+1
* | | | | Sync with maintJunio C Hamano2015-06-280-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-06-252-9/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cb/array-size' into maintJunio C Hamano2015-06-251-5/+3
| |\ \ \ \ \ \
* | | | | | | | Git 2.5.0-rc0v2.5.0-rc0Junio C Hamano2015-06-252-16/+3
* | | | | | | | Merge branch 'cn/cvsimport-perl-update'Junio C Hamano2015-06-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | cvsimport: silence regex warning appearing in Perl 5.22.cn/cvsimport-perl-updateChristian Neukirchen2015-06-241-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'cb/array-size'Junio C Hamano2015-06-251-5/+3
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fix definition of ARRAY_SIZE for non-gcc buildscb/array-sizeCharles Bailey2015-06-241-5/+3
* | | | | | | | Sync with 2.4.5Junio C Hamano2015-06-252-1/+30
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Git 2.4.5v2.4.5Junio C Hamano2015-06-254-3/+32
| * | | | | | | Merge branch 'sg/merge-summary-config' into maintJunio C Hamano2015-06-253-16/+12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/make-fix-dependencies' into maintJunio C Hamano2015-06-251-24/+25
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sb/pack-protocol-mention-smart-http' into maintJunio C Hamano2015-06-251-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano2015-06-252-10/+26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/pull-tags-error-diag' into maintJunio C Hamano2015-06-251-9/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano2015-06-255-22/+23
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diagnose-config-mmap-failure' into maintJunio C Hamano2015-06-254-11/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano2015-06-257-9/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2015-06-252-41/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-06-254-38/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-aJunio C Hamano2015-06-234-38/+8
* | | | | | | | | | | | | | | | | | Ninth batch for 2.5Junio C Hamano2015-06-241-39/+102
* | | | | | | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index'Junio C Hamano2015-06-242-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Revert "stash: require a clean index to apply"jk/stash-require-clean-indexJeff King2015-06-152-9/+0
* | | | | | | | | | | | | | | | | | Merge branch 'pa/auto-gc-mac-osx'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | hooks/pre-auto-gc: adjust power checking for newer OS Xpa/auto-gc-mac-osxPanagiotis Astithas2015-06-121-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'pt/t0302-needs-sanity'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t0302: "unreadable" test needs SANITY prereqpt/t0302-needs-sanityPaul Tan2015-06-121-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-changes-block-size'Junio C Hamano2015-06-243-31/+165
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \