Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jh/checkout-auto-tracking' into maint | Junio C Hamano | 2013-06-27 | 4 | -5/+173 |
|\ | |||||
| * | branch.c: Validate tracking branches with refspecs instead of refs/remotes/* | Johan Herland | 2013-04-21 | 2 | -2/+2 |
| * | t9114.2: Don't use --track option against "svn-remote"-tracking branches | Johan Herland | 2013-04-21 | 1 | -1/+1 |
| * | t7201.24: Add refspec to keep --track working | Johan Herland | 2013-04-21 | 1 | -0/+1 |
| * | t3200.39: tracking setup should fail if there is no matching refspec. | Johan Herland | 2013-04-21 | 1 | -4/+4 |
| * | checkout: Use remote refspecs when DWIMming tracking branches | Johan Herland | 2013-04-21 | 1 | -3/+3 |
| * | t2024: Show failure to use refspec when DWIMming remote branch names | Johan Herland | 2013-04-21 | 1 | -1/+69 |
| * | t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>' | Johan Herland | 2013-04-21 | 1 | -0/+99 |
* | | Merge branch 'maint-1.8.2' into maint | Junio C Hamano | 2013-06-11 | 1 | -1/+1 |
|\ \ | |||||
| * | | t0070 "mktemp to unwritable directory" needs SANITY | Torsten Bögershausen | 2013-06-11 | 1 | -1/+1 |
* | | | Merge branch 'kb/status-ignored-optim-2' into maint | Junio C Hamano | 2013-06-09 | 1 | -0/+18 |
|\ \ \ | |||||
| * | | | dir.c: fix ignore processing within not-ignored directories | Karsten Blees | 2013-06-02 | 1 | -0/+18 |
* | | | | t/README: test_must_fail is for testing Git | Junio C Hamano | 2013-06-04 | 1 | -0/+3 |
* | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |