Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/maint-submodule-checkout' | Junio C Hamano | 2009-04-07 | 1 | -0/+42 |
|\ | |||||
| * | Fix 'git checkout <submodule>' to update the index | Johannes Schindelin | 2009-04-02 | 1 | -0/+42 |
* | | Merge branch 'cb/maint-merge-recursive-submodule-fix' | Junio C Hamano | 2009-04-07 | 1 | -0/+74 |
|\ \ | |||||
| * | | 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 |
| |\ \ | |||||
| * \ \ | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint | Junio C Hamano | 2009-04-02 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | |||||
* | | | | Merge branch 'jc/shared-literally' | Junio C Hamano | 2009-04-06 | 1 | -0/+37 |
|\ \ \ \ | |||||
| * | | | | t1301: loosen test for forced modes | Jeff King | 2009-04-01 | 1 | -2/+2 |
| * | | | | "core.sharedrepository = 0mode" should set, not loosen | Junio C Hamano | 2009-03-27 | 1 | -0/+37 |
* | | | | | Merge branch 'mg/tracked-local-branches' | Junio C Hamano | 2009-04-06 | 1 | -1/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Make local branches behave like remote branches when --tracked | Michael J Gruber | 2009-04-01 | 1 | -1/+1 |
| * | | | | | Test for local branches being followed with --track | Michael J Gruber | 2009-03-27 | 1 | -1/+9 |
* | | | | | | Merge branch 'sb/format-patch-patchname' | Junio C Hamano | 2009-04-06 | 11 | -33/+265 |
|\ \ \ \ \ \ | |||||
| * | | | | | | format-patch: --numbered-files and --stdout aren't mutually exclusive | Stephen Boyd | 2009-03-22 | 2 | -1/+171 |
| * | | | | | | format-patch: --attach/inline uses filename instead of SHA1 | Stephen Boyd | 2009-03-22 | 10 | -32/+94 |
* | | | | | | | tests: remove exit after test_done call | Jeff King | 2009-04-05 | 17 | -26/+0 |
* | | | | | | | send-email: fix nasty bug in ask() function | Jay Soffian | 2009-04-04 | 1 | -0/+13 |
* | | | | | | | send-email: ensure quoted addresses are rfc2047 encoded | Jay Soffian | 2009-04-02 | 1 | -0/+13 |
* | | | | | | | send-email: correct two tests which were going interactive | Jay Soffian | 2009-04-02 | 1 | -3/+5 |
* | | | | | | | Merge branch 'ef/fast-export' | Junio C Hamano | 2009-04-01 | 1 | -0/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | builtin-fast-export.c: handle nested tags | Erik Faye-Lund | 2009-03-29 | 1 | -2/+2 |
| * | | | | | | | builtin-fast-export.c: fix crash on tagged trees | Erik Faye-Lund | 2009-03-29 | 1 | -3/+2 |
| * | | | | | | | test-suite: adding a test for fast-export with tag variants | Erik Faye-Lund | 2009-03-29 | 1 | -0/+16 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'mh/format-patch-add-header' | Junio C Hamano | 2009-04-01 | 1 | -0/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | format-patch: add arbitrary email headers | Michael Hendricks | 2009-03-27 | 1 | -0/+15 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/maint-1.6.0-keep-pack' | Junio C Hamano | 2009-04-01 | 1 | -0/+61 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pack-objects: don't loosen objects available in alternate or kept packs | Brandon Casey | 2009-03-21 | 1 | -1/+1 |
| * | | | | | | | t7700: demonstrate repack flaw which may loosen objects unnecessarily | Brandon Casey | 2009-03-21 | 1 | -0/+17 |
| * | | | | | | | pack-objects: only repack or loosen objects residing in "local" packs | Brandon Casey | 2009-03-20 | 1 | -1/+1 |
| * | | | | | | | git-repack.sh: don't use --kept-pack-only option to pack-objects | Brandon Casey | 2009-03-20 | 1 | -1/+1 |
| * | | | | | | | t7700-repack: add two new tests demonstrating repacking flaws | Brandon Casey | 2009-03-20 | 1 | -0/+44 |
* | | | | | | | | send-email: ask_default should apply to all emails, not just the first | Jay Soffian | 2009-04-01 | 1 | -1/+3 |
* | | | | | | | | send-email: add tests for refactored prompting | Jay Soffian | 2009-03-29 | 1 | -4/+48 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-03-28 | 2 | -9/+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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | |