Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2009-08-26 | 1 | -9/+9 |
|\ | |||||
| * | git-log: allow --decorate[=short|full] | Lars Hjemli | 2009-08-26 | 2 | -0/+35 |
| * | git-bisect: call the found commit "*the* first bad commit" | Nanako Shiraishi | 2009-08-26 | 1 | -9/+9 |
| * | Merge branch 'jc/maint-clean-nested-dir-safety' into maint | Junio C Hamano | 2009-08-26 | 1 | -0/+39 |
| |\ | |||||
| * \ | Merge branch 'jk/maint-merge-msg-fix' into maint | Junio C Hamano | 2009-08-26 | 3 | -3/+63 |
| |\ \ | |||||
| * \ \ | Merge branch 'jc/apply-epoch-patch' into maint | Junio C Hamano | 2009-08-26 | 1 | -0/+95 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jp/symlink-dirs' into maint | Junio C Hamano | 2009-08-26 | 1 | -0/+93 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'maint-1.6.3' into maint | Junio C Hamano | 2009-08-26 | 1 | -0/+11 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3 | Junio C Hamano | 2009-08-26 | 1 | -0/+11 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge branch 'bc/maint-am-email' into maint | Junio C Hamano | 2009-08-21 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | am: allow individual e-mail files as input | Junio C Hamano | 2009-08-10 | 1 | -0/+15 |
| * | | | | | | | | Merge branch 'jc/maint-merge-recursive-fix' into maint | Junio C Hamano | 2009-08-21 | 1 | -0/+55 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sb/maint-pull-rebase' into maint | Junio C Hamano | 2009-08-21 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'aj/fix-read-tree-from-scratch' | Junio C Hamano | 2009-08-25 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | read-tree: Fix regression with creation of a new index file. | Alexandre Julliard | 2009-08-17 | 1 | -0/+25 |
* | | | | | | | | | | | Merge branch 'jc/maint-checkout-index-to-prefix' | Junio C Hamano | 2009-08-25 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | check_path(): allow symlinked directories to checkout-index --prefix | Junio C Hamano | 2009-08-18 | 1 | -0/+9 |
* | | | | | | | | | | | | Merge branch 'jl/submodule-summary-diff-files' | Junio C Hamano | 2009-08-25 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git submodule summary: add --files option | Jens Lehmann | 2009-08-14 | 1 | -0/+22 |
* | | | | | | | | | | | | | Merge branch 'lh/short-decorate' | Junio C Hamano | 2009-08-25 | 2 | -0/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | git-log: allow --decorate[=short|full] | Lars Hjemli | 2009-08-18 | 2 | -0/+35 |
* | | | | | | | | | | | | | | Merge branch 'cc/replace' | Junio C Hamano | 2009-08-21 | 1 | -0/+200 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t6050: check pushing something based on a replaced commit | Christian Couder | 2009-05-31 | 1 | -0/+68 |
| * | | | | | | | | | | | | | | builtin-replace: teach "git replace" to actually replace | Christian Couder | 2009-05-31 | 1 | -0/+10 |
| * | | | | | | | | | | | | | | Add new "git replace" command | Christian Couder | 2009-05-31 | 1 | -0/+12 |
| * | | | | | | | | | | | | | | environment: add global variable to disable replacement | Christian Couder | 2009-05-31 | 1 | -0/+23 |
| * | | | | | | | | | | | | | | mktag: call "check_sha1_signature" with the replacement sha1 | Christian Couder | 2009-05-31 | 1 | -0/+12 |
| * | | | | | | | | | | | | | | replace_object: add a test case | Christian Couder | 2009-05-31 | 1 | -0/+75 |
* | | | | | | | | | | | | | | | Merge branch 'gb/apply-ignore-whitespace' | Junio C Hamano | 2009-08-21 | 1 | -0/+185 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | git apply: option to ignore whitespace differences | Giuseppe Bilotta | 2009-08-05 | 1 | -0/+185 |
* | | | | | | | | | | | | | | | | Merge branch 'bc/mailsplit-cr-at-eol' | Junio C Hamano | 2009-08-21 | 1 | -2/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings | Junio C Hamano | 2009-08-05 | 1 | -2/+24 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Make test number t7406- unique | Johannes Sixt | 2009-08-21 | 1 | -0/+0 |
* | | | | | | | | | | | | | | | | Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' | Junio C Hamano | 2009-08-18 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | add -p: do not attempt to coalesce mode changes | Thomas Rast | 2009-08-15 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | git add -p: demonstrate failure when staging both mode and hunk | Kirill Smelkov | 2009-08-15 | 1 | -0/+11 |
* | | | | | | | | | | | | | | | | svn: assume URLs from the command-line are URI-encoded | Eric Wong | 2009-08-18 | 1 | -0/+52 |
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'jc/maint-clean-nested-dir-safety' | Junio C Hamano | 2009-08-16 | 1 | -0/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | clean: require double -f options to nuke nested git repository and work tree | Junio C Hamano | 2009-07-29 | 1 | -0/+39 |
* | | | | | | | | | | | | | | | Merge branch 'jk/maint-merge-msg-fix' | Junio C Hamano | 2009-08-16 | 3 | -3/+63 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | merge: indicate remote tracking branches in merge message | Jeff King | 2009-08-09 | 2 | -1/+11 |
| * | | | | | | | | | | | | | | merge: fix incorrect merge message for ambiguous tag/branch | Jeff King | 2009-08-09 | 2 | -3/+3 |
| * | | | | | | | | | | | | | | add tests for merge message headings | Jeff King | 2009-08-09 | 1 | -0/+50 |
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | svn: allow branches outside of refs/remotes | Adam Brewster | 2009-08-12 | 5 | -19/+48 |
* | | | | | | | | | | | | | | svn: initial "master" points to trunk if possible | Eric Wong | 2009-08-12 | 2 | -1/+31 |
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | allow pull --rebase on branch yet to be born | Jeff King | 2009-08-12 | 1 | -0/+11 |
* | | | | | | | | | | | | | Merge branch 'jc/maint-merge-recursive-fix' | Junio C Hamano | 2009-08-10 | 1 | -0/+55 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | merge-recursive: don't segfault while handling rename clashes | Junio C Hamano | 2009-07-30 | 1 | -0/+55 |
* | | | | | | | | | | | | | Merge branch 'ns/am-raw-email' | Junio C Hamano | 2009-08-10 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | am: allow individual e-mail files as input | Junio C Hamano | 2009-08-06 | 1 | -0/+15 |