Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t3901: test git-am encoding conversionpt/am-tests | Paul Tan | 2015-07-20 | 1 | -0/+62 |
* | t3418: non-interactive rebase --continue with rerere enabled | Paul Tan | 2015-07-20 | 1 | -0/+19 |
* | t4150: tests for am --[no-]scissors | Paul Tan | 2015-07-20 | 1 | -0/+48 |
* | t4150: am with post-applypatch hook | Paul Tan | 2015-07-20 | 1 | -0/+38 |
* | t4150: am with pre-applypatch hook | Paul Tan | 2015-07-20 | 1 | -0/+33 |
* | t4150: am with applypatch-msg hook | Paul Tan | 2015-07-20 | 1 | -0/+35 |
* | t4150: am --resolved fails if index has unmerged entries | Paul Tan | 2015-07-20 | 1 | -0/+13 |
* | t4150: am --resolved fails if index has no changes | Paul Tan | 2015-07-20 | 1 | -0/+12 |
* | t4150: am refuses patches when paused | Paul Tan | 2015-07-20 | 1 | -0/+14 |
* | t4151: am --abort will keep dirty index intact | Paul Tan | 2015-07-20 | 1 | -0/+15 |
* | t4150: am fails if index is dirty | Paul Tan | 2015-07-20 | 1 | -0/+12 |
* | t4150: am.messageid really adds the message id | Paul Tan | 2015-07-07 | 1 | -0/+12 |
* | Git 2.5.0-rc1v2.5.0-rc1 | Junio C Hamano | 2015-07-01 | 2 | -1/+8 |
* | Merge branch 'me/fetch-into-shallow-safety' | Junio C Hamano | 2015-07-01 | 1 | -1/+1 |
|\ | |||||
| * | fetch-pack: check for shallow if depth givenme/fetch-into-shallow-safety | Mike Edgar | 2015-06-17 | 1 | -1/+1 |
* | | Merge branch 'jc/prompt-document-ps1-state-separator' | Junio C Hamano | 2015-07-01 | 1 | -0/+4 |
|\ \ | |||||
| * | | git-prompt.sh: document GIT_PS1_STATESEPARATORjc/prompt-document-ps1-state-separator | Joe Cridge | 2015-06-10 | 1 | -0/+4 |
* | | | Merge branch 'mm/describe-doc' | Junio C Hamano | 2015-07-01 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Documentation/describe: improve one-line summarymm/describe-doc | Matthieu Moy | 2015-06-16 | 1 | -1/+1 |
* | | | | Merge branch 'da/mergetool-winmerge' | Junio C Hamano | 2015-07-01 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | mergetool-lib: fix default tool selectionda/mergetool-winmerge | Michael J Gruber | 2015-06-19 | 1 | -0/+1 |
* | | | | | Sync with maint | Junio C Hamano | 2015-06-28 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/stash-require-clean-index' into maint | Junio C Hamano | 2015-06-25 | 2 | -9/+0 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'cb/array-size' into maint | Junio C Hamano | 2015-06-25 | 1 | -5/+3 |
| |\ \ \ \ \ \ | |||||
* | | | | | | | | Git 2.5.0-rc0v2.5.0-rc0 | Junio C Hamano | 2015-06-25 | 2 | -16/+3 |
* | | | | | | | | Merge branch 'cn/cvsimport-perl-update' | Junio C Hamano | 2015-06-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | cvsimport: silence regex warning appearing in Perl 5.22.cn/cvsimport-perl-update | Christian Neukirchen | 2015-06-24 | 1 | -1/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'cb/array-size' | Junio C Hamano | 2015-06-25 | 1 | -5/+3 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Fix definition of ARRAY_SIZE for non-gcc buildscb/array-size | Charles Bailey | 2015-06-24 | 1 | -5/+3 |
* | | | | | | | | Sync with 2.4.5 | Junio C Hamano | 2015-06-25 | 2 | -1/+30 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Git 2.4.5v2.4.5 | Junio C Hamano | 2015-06-25 | 4 | -3/+32 |
| * | | | | | | | Merge branch 'sg/merge-summary-config' into maint | Junio C Hamano | 2015-06-25 | 3 | -16/+12 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/make-fix-dependencies' into maint | Junio C Hamano | 2015-06-25 | 1 | -24/+25 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sb/pack-protocol-mention-smart-http' into maint | Junio C Hamano | 2015-06-25 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/die-on-bogus-worktree-late' into maint | Junio C Hamano | 2015-06-25 | 2 | -10/+26 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/pull-tags-error-diag' into maint | Junio C Hamano | 2015-06-25 | 1 | -9/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/color-diff-plain-is-context' into maint | Junio C Hamano | 2015-06-25 | 5 | -22/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diagnose-config-mmap-failure' into maint | Junio C Hamano | 2015-06-25 | 4 | -11/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint | Junio C Hamano | 2015-06-25 | 7 | -9/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/rebase-i-post-rewrite-exec' into maint | Junio C Hamano | 2015-06-25 | 2 | -41/+58 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/diff-i-t-a' | Junio C Hamano | 2015-06-25 | 4 | -38/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-a | Junio C Hamano | 2015-06-23 | 4 | -38/+8 |
* | | | | | | | | | | | | | | | | | | Ninth batch for 2.5 | Junio C Hamano | 2015-06-24 | 1 | -39/+102 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index' | Junio C Hamano | 2015-06-24 | 2 | -9/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Revert "stash: require a clean index to apply"jk/stash-require-clean-index | Jeff King | 2015-06-15 | 2 | -9/+0 |
* | | | | | | | | | | | | | | | | | | Merge branch 'pa/auto-gc-mac-osx' | Junio C Hamano | 2015-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | hooks/pre-auto-gc: adjust power checking for newer OS Xpa/auto-gc-mac-osx | Panagiotis Astithas | 2015-06-12 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'pt/t0302-needs-sanity' | Junio C Hamano | 2015-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | t0302: "unreadable" test needs SANITY prereqpt/t0302-needs-sanity | Paul Tan | 2015-06-12 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-changes-block-size' | Junio C Hamano | 2015-06-24 | 3 | -31/+165 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |