Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t7500: fix flipped actual/expect | Andrew Pimlott | 2013-07-01 | 1 | -3/+3 |
* | lib-rebase: document exec_ in FAKE_LINES | Andrew Pimlott | 2013-07-01 | 1 | -0/+2 |
* | test: spell 'ls-files --delete' option correctly in test descriptions | SZEDER Gábor | 2013-06-30 | 1 | -2/+2 |
* | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maint | Junio C Hamano | 2013-06-28 | 1 | -0/+7 |
|\ | |||||
| * | fetch-pack: prepare updated shallow file before fetching the pack | Nguyễn Thái Ngọc Duy | 2013-05-28 | 1 | -0/+7 |
* | | Merge branch 'ks/difftool-dir-diff-copy-fix' into maint | Junio C Hamano | 2013-06-27 | 1 | -0/+19 |
|\ \ | |||||
| * | | difftool --dir-diff: allow changing any clean working tree file | Kenichi Saita | 2013-05-29 | 1 | -0/+19 |
* | | | Merge branch 'fc/show-branch-in-rebase-am' into maint | Junio C Hamano | 2013-06-27 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | prompt: fix for simple rebase | Felipe Contreras | 2013-05-29 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'rs/commit-m-no-edit' into maint | Junio C Hamano | 2013-06-27 | 1 | -0/+17 |
|\ \ \ | |||||
| * | | | commit: don't start editor if empty message is given with -m | René Scharfe | 2013-05-28 | 1 | -0/+17 |
* | | | | Merge branch 'jc/strbuf-branchname-fix' into maint | Junio C Hamano | 2013-06-27 | 1 | -2/+13 |
|\ \ \ \ | |||||
| * | | | | strbuf_branchname(): do not double-expand @{-1}~22 | Junio C Hamano | 2013-05-16 | 1 | -2/+13 |
* | | | | | Merge branch 'mk/combine-diff-context-horizon-fix' into maint | Junio C Hamano | 2013-06-27 | 1 | -0/+48 |
|\ \ \ \ \ | |||||
| * | | | | | combine-diff.c: Fix output when changes are exactly 3 lines apart | Matthijs Kooijman | 2013-05-15 | 1 | -0/+48 |
* | | | | | | Merge branch 'kb/ancestry-path-threedots' into maint | Junio C Hamano | 2013-06-27 | 1 | -1/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | revision.c: treat A...B merge bases as if manually specified | Kevin Bracey | 2013-05-16 | 1 | -1/+1 |
| * | | | | | | t6019: demonstrate --ancestry-path A...B breakage | Kevin Bracey | 2013-05-13 | 1 | -1/+20 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'mh/fetch-into-shallow' into maint | Junio C Hamano | 2013-06-27 | 1 | -0/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t5500: add test for fetching with an unknown 'shallow' | Michael Heemskerk | 2013-05-02 | 1 | -0/+14 |
* | | | | | | | 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 |