Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update cache for conflicting submodule entries | Clemens Buchacher | 2009-04-05 | 1 | -1/+1 |
* | add tests for merging with submodules | Clemens Buchacher | 2009-04-05 | 1 | -0/+74 |
* | Merge branch 'js/maint-diff-temp-smudge' into maint | Junio C Hamano | 2009-04-02 | 1 | -0/+16 |
|\ | |||||
| * | Smudge the files fed to external diff and textconv | Johannes Schindelin | 2009-03-22 | 1 | -0/+16 |
* | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint | Junio C Hamano | 2009-04-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | git-branch: display "was sha1" on branch deletion rather than just "sha1" | Brandon Casey | 2009-03-21 | 1 | -1/+1 |
* | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-03-28 | 2 | -9/+1 |
|\ \ \ | |||||
| * | | | test-lib: Clean up comments and Makefile. | Emil Sit | 2009-03-28 | 2 | -9/+1 |
| * | | | Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1 | Junio C Hamano | 2009-03-21 | 2 | -19/+20 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1 | Junio C Hamano | 2009-03-21 | 1 | -0/+17 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-03-12 | 2 | -1/+33 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0 | Junio C Hamano | 2009-03-12 | 21 | -2/+209 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0 | Junio C Hamano | 2009-03-12 | 1 | -0/+25 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0 | Junio C Hamano | 2009-03-12 | 1 | -1/+8 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0 | Junio C Hamano | 2009-03-12 | 1 | -0/+18 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ | Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1 | Junio C Hamano | 2009-03-12 | 1 | -0/+26 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1 | Junio C Hamano | 2009-03-12 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1 | Junio C Hamano | 2009-03-12 | 1 | -1/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1 | Junio C Hamano | 2009-03-12 | 1 | -0/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.1-allow-uninteresting-missing' into maint-1.6.1 | Junio C Hamano | 2009-03-12 | 1 | -0/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1 | Junio C Hamano | 2009-03-12 | 21 | -2/+209 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'tr/maint-1.6.0-send-email-irt' into maint | Junio C Hamano | 2009-03-21 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | send-email: test --no-thread --in-reply-to combination | Thomas Rast | 2009-03-11 | 1 | -0/+11 |
* | | | | | | | | | | | | | | | | | Merge branch 'mg/maint-submodule-normalize-path' into maint | Junio C Hamano | 2009-03-21 | 1 | -0/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | git submodule: Fix adding of submodules at paths with ./, .. and // | Michael J Gruber | 2009-03-03 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | | | git submodule: Add test cases for git submodule add | Michael J Gruber | 2009-03-03 | 1 | -0/+49 |
* | | | | | | | | | | | | | | | | | | Merge branch 'js/rsync-local' into maint | Junio C Hamano | 2009-03-21 | 1 | -19/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | rsync transport: allow local paths, and fix tests | Johannes Schindelin | 2009-03-10 | 1 | -19/+20 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maint | Junio C Hamano | 2009-03-21 | 1 | -0/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | read-tree A B C: do not create a bogus index and do not segfault | Junio C Hamano | 2009-03-12 | 1 | -0/+31 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-send-email' into maint | Junio C Hamano | 2009-03-11 | 1 | -25/+167 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | send-email: --suppress-cc improvements | Jay Soffian | 2009-02-14 | 1 | -19/+131 |
| * | | | | | | | | | | | | | | | | | | | | send-email: handle multiple Cc addresses when reading mbox message | Jay Soffian | 2009-02-14 | 1 | -7/+37 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'fg/maint-exclude-bq' into maint | Junio C Hamano | 2009-03-11 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Support "\" in non-wildcard exclusion entries | Finn Arne Gangstad | 2009-02-12 | 1 | -1/+8 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-03-07 | 1 | -0/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | builtin-revert.c: release index lock when cherry-picking an empty commit | Chris Johnsen | 2009-03-07 | 1 | -0/+33 |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | t1300: use test_must_fail as appropriate | Jeff King | 2009-03-07 | 1 | -5/+5 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | t3400-rebase: Move detached HEAD check earlier | Johannes Sixt | 2009-03-01 | 1 | -4/+4 |
* | | | | | | | | | | | | | | | | | git-svn: disable broken symlink workaround by default | Eric Wong | 2009-02-27 | 1 | -0/+10 |
* | | | | | | | | | | | | | | | | | Merge branch 'cc/maint-1.6.0-bisect-fix' | Junio C Hamano | 2009-02-27 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped | Christian Couder | 2009-02-27 | 1 | -0/+25 |
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | t5540-http-push.sh: avoid non-portable grep -P | Jay Soffian | 2009-02-26 | 1 | -3/+8 |
* | | | | | | | | | | | | | | | | Merge branch 'jc/maint-1.6.0-pack-directory' | Junio C Hamano | 2009-02-25 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Make sure objects/pack exists before creating a new pack | Junio C Hamano | 2009-02-25 | 1 | -0/+17 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Allow HTTP tests to run on Darwin | Jay Soffian | 2009-02-25 | 2 | -5/+23 |
* | | | | | | | | | | | | | | | git-svn: fix delete+add branch tracking with empty files | Eric Wong | 2009-02-22 | 2 | -0/+204 |
* | | | | | | | | | | | | | | | Introduce the function strip_path_suffix() | Johannes Schindelin | 2009-02-19 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-02-18 | 4 | -3/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | tests: fix "export var=val" | Junio C Hamano | 2009-02-18 | 2 | -3/+3 |