Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile | Junio C Hamano | 2013-06-07 | 1 | -25/+41 |
|\ | |||||
| * | git-remote-testgit: build it to run under $SHELL_PATH | Junio C Hamano | 2013-04-28 | 1 | -5/+0 |
| * | t5801: "VAR=VAL shell_func args" is forbidden | Junio C Hamano | 2013-04-25 | 1 | -1/+3 |
| * | transport-helper: update remote helper namespace | Felipe Contreras | 2013-04-17 | 1 | -0/+12 |
| * | transport-helper: warn when refspec is not used | Felipe Contreras | 2013-04-17 | 1 | -2/+4 |
| * | transport-helper: clarify pushing without refspecs | Felipe Contreras | 2013-04-17 | 1 | -3/+3 |
| * | transport-helper: clarify *:* refspec | Felipe Contreras | 2013-04-17 | 1 | -15/+0 |
| * | transport-helper: improve push messages | Felipe Contreras | 2013-04-11 | 1 | -0/+14 |
| * | transport-helper: mention helper name when it dies | Jeff King | 2013-04-11 | 1 | -1/+1 |
| * | transport-helper: report errors properly | Felipe Contreras | 2013-04-11 | 1 | -0/+20 |
* | | git-svn: introduce --parents parameter for commands branch and tag | Tobias Schulte | 2013-05-20 | 1 | -0/+48 |
* | | difftool: fix dir-diff when file does not exist in working tree | John Keeping | 2013-05-17 | 1 | -0/+7 |
* | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2013-05-11 | 2 | -1/+149 |
|\ \ | |||||
| * | | git-svn: added an --include-path flag | Paul Walmsley | 2013-05-09 | 1 | -0/+149 |
| * | | git-svn: avoid self-referencing mergeinfo | Michael Contreras | 2013-05-09 | 1 | -1/+0 |
* | | | Sync with v1.8.2.3 | Junio C Hamano | 2013-05-09 | 1 | -4/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | t5004: avoid using tar for checking emptiness of archive | René Scharfe | 2013-05-09 | 1 | -3/+2 |
| * | | t5004: ignore pax global header file | René Scharfe | 2013-05-09 | 1 | -1/+1 |
* | | | Merge branch 'jk/merge-tree-added-identically' | Junio C Hamano | 2013-05-06 | 1 | -0/+51 |
|\ \ \ | |||||
| * | | | merge-tree: handle directory/empty conflict correctly | John Keeping | 2013-05-06 | 1 | -0/+51 |
* | | | | Merge branch 'fc/push-with-export-reporting-result' | Junio C Hamano | 2013-05-05 | 1 | -0/+14 |
|\ \ \ \ | |||||
| * | | | | transport-helper: improve push messages | Felipe Contreras | 2013-05-05 | 1 | -0/+14 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'tr/remote-tighten-commandline-parsing' into maint | Junio C Hamano | 2013-05-03 | 1 | -0/+22 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'tr/remote-tighten-commandline-parsing' | Junio C Hamano | 2013-05-01 | 1 | -0/+22 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | remote: 'show' and 'prune' can take more than one remote | Thomas Rast | 2013-04-24 | 1 | -8/+3 |
| * | | | | remote: check for superfluous arguments in 'git remote add' | Thomas Rast | 2013-04-24 | 1 | -1/+1 |
| * | | | | remote: add a test for extra arguments, according to docs | Thomas Rast | 2013-04-24 | 1 | -0/+27 |
* | | | | | Merge branch 'zk/prompt-rebase-step' | Junio C Hamano | 2013-05-01 | 1 | -4/+10 |
|\ \ \ \ \ | |||||
| * | | | | | bash-prompt.sh: show where rebase is at when stopped | Zoltan Klinger | 2013-04-25 | 1 | -4/+10 |
| |/ / / / | |||||
* | | | | | Merge branch 'maint' | Junio C Hamano | 2013-04-28 | 1 | -38/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | t/Makefile: remove smoke test targets | John Keeping | 2013-04-28 | 1 | -38/+0 |
* | | | | | Merge branch 'jk/merge-tree-added-identically' | Junio C Hamano | 2013-04-28 | 1 | -0/+13 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | merge-tree: fix typo in "both changed identically" | John Keeping | 2013-04-28 | 1 | -0/+13 |
* | | | | | Merge branch 'th/bisect-skipped-log' | Junio C Hamano | 2013-04-26 | 1 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | bisect: Log possibly bad, skipped commits at bisection end | Torstein Hegge | 2013-04-23 | 1 | -0/+20 |
* | | | | | | Merge branch 'ph/rebase-original' | Junio C Hamano | 2013-04-26 | 1 | -0/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rebase: find orig_head unambiguously | Phil Hord | 2013-04-23 | 1 | -0/+7 |
* | | | | | | | Sync with 1.8.2.2 | Junio C Hamano | 2013-04-26 | 3 | -10/+22 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'jk/chopped-ident' into maint | Junio C Hamano | 2013-04-26 | 2 | -4/+43 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'rt/commentchar-fmt-merge-msg' into maint | Junio C Hamano | 2013-04-26 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'rs/empty-archive' into maint | Junio C Hamano | 2013-04-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'pe/pull-rebase-v-q' into maint | Junio C Hamano | 2013-04-26 | 1 | -0/+27 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t7409: do not use export X=Y | Torsten Bögershausen | 2013-04-26 | 1 | -4/+10 |
| * | | | | | | | | | | t9501: do not use export X=Y | Torsten Bögershausen | 2013-04-26 | 1 | -5/+10 |
| * | | | | | | | | | | t9020: do not use export X=Y | Torsten Bögershausen | 2013-04-26 | 1 | -1/+2 |
| * | | | | | | | | | | Merge branch 'sr/log-SG-no-textconv' into maint | Junio C Hamano | 2013-04-24 | 1 | -0/+28 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/merge-tag-object' into maint | Junio C Hamano | 2013-04-24 | 1 | -32/+68 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'jk/doc-http-backend' into maint | Junio C Hamano | 2013-04-22 | 2 | -0/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/test-trash' into maint | Junio C Hamano | 2013-04-22 | 1 | -9/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/rerere-forget-protect-against-NUL' into maint | Junio C Hamano | 2013-04-22 | 1 | -0/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |