| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | git notes merge: List conflicting notes in notes merge commit message | Johan Herland | 2010-11-17 | 1 | -0/+12 |
| * | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 2010-11-17 | 1 | -0/+176 |
| * | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 2010-11-17 | 1 | -0/+292 |
| * | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland | 2010-11-17 | 1 | -0/+502 |
| * | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 2010-11-17 | 1 | -0/+188 |
| * | git notes merge: Initial implementation handling trivial merges only | Johan Herland | 2010-11-17 | 1 | -0/+180 |
| * | notes.c: Use two newlines (instead of one) when concatenating notes | Johan Herland | 2010-11-17 | 4 | -0/+11 |
| * | (trivial) t3303: Indent with tabs instead of spaces for consistency | Johan Herland | 2010-11-17 | 1 | -9/+9 |
| * | t7003: fix subdirectory-filter test | Thomas Rast | 2010-08-09 | 1 | -1/+2 |
| * | Allow "check-ref-format --branch" from subdirectory | Jonathan Nieder | 2010-08-06 | 1 | -0/+17 |
| * | Merge branch 'ab/tap' into maint | Junio C Hamano | 2010-08-02 | 1 | -4/+3 |
| |\ | |||||
| | * | test-lib: Remove 3 year old no-op --no-python option | Ævar Arnfjörð Bjarmason | 2010-08-02 | 1 | -3/+0 |
| | * | test-lib: Ignore --quiet under a TAP harness | Ævar Arnfjörð Bjarmason | 2010-08-02 | 1 | -1/+3 |
| * | | Fix git rebase --continue to work with touched files | David D. Kilzer | 2010-07-28 | 1 | -0/+43 |
| * | | Sync with 1.7.1.2 | Junio C Hamano | 2010-07-27 | 1 | -1/+23 |
| |\ \ | |||||
| | * \ | Sync with 1.7.0 series | Junio C Hamano | 2010-07-27 | 1 | -1/+23 |
| | |\ \ | |||||
| | | * | | config --get --path: check for unset $HOME | Jonathan Nieder | 2010-07-27 | 1 | -1/+23 |
| | | * | | Merge branch 'maint-1.6.6' into maint-1.7.0 | Junio C Hamano | 2010-07-25 | 1 | -0/+18 |
| | | |\ \ | |||||
| | | | * \ | Merge branch 'maint-1.6.5' into maint-1.6.6 | Junio C Hamano | 2010-07-25 | 1 | -0/+18 |
| | | | |\ \ | |||||
| | | | | * \ | Merge branch 'maint-1.6.4' into maint-1.6.5 | Junio C Hamano | 2010-07-25 | 1 | -0/+18 |
| | | | | |\ \ | |||||
| * | | | | | | | t3700-add: fix dependence on stdout and stderr buffering | Johannes Sixt | 2010-07-25 | 1 | -3/+6 |
| * | | | | | | | git-rebase--interactive.sh: use printf instead of echo to print commit message | Brandon Casey | 2010-07-25 | 1 | -1/+7 |
| * | | | | | | | tests: correct "does reflog exist?" tests | Junio C Hamano | 2010-07-21 | 2 | -49/+11 |
| * | | | | | | | t/: work around one-shot variable assignment with test_must_fail | Brandon Casey | 2010-07-21 | 3 | -8/+40 |
| * | | | | | | | t/README: correct an exception when breaking a && chain in tests | Jonathan Nieder | 2010-07-21 | 1 | -4/+4 |
| * | | | | | | | t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail | Brandon Casey | 2010-07-20 | 2 | -2/+2 |
| * | | | | | | | t/t3700: convert two uses of negation operator '!' to use test_must_fail | Brandon Casey | 2010-07-20 | 1 | -2/+2 |
| * | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-07-20 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | t/README: clarify test_must_fail description | Brandon Casey | 2010-07-20 | 1 | -0/+8 |
| * | | | | | | | git submodule add: Require the new --force option to add ignored paths | Jens Lehmann | 2010-07-19 | 1 | -12/+15 |
| * | | | | | | | Merge branch 'jl/add-n-ignore-missing' | Junio C Hamano | 2010-07-19 | 1 | -0/+25 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | git add: Add the "--ignore-missing" option for the dry run | Jens Lehmann | 2010-07-12 | 1 | -0/+25 |
| * | | | | | | | | Only run aggregate-results over actual counts | Thomas Rast | 2010-07-16 | 2 | -2/+2 |
| * | | | | | | | | Merge branch 'jn/paginate-fix' | Junio C Hamano | 2010-07-15 | 1 | -45/+196 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | git --paginate: paginate external commands again | Jonathan Nieder | 2010-07-14 | 1 | -12/+35 |
| | * | | | | | | | | git --paginate: do not commit pager choice too early | Nguyễn Thái Ngọc Duy | 2010-06-28 | 1 | -12/+46 |
| | * | | | | | | | | tests: local config file should be honored from subdirs of toplevel | Jonathan Nieder | 2010-06-28 | 1 | -0/+26 |
| | * | | | | | | | | t7006: test pager configuration for several git commands | Jonathan Nieder | 2010-06-28 | 1 | -52/+84 |
| | * | | | | | | | | t7006 (pager): introduce helper for parameterized tests | Jonathan Nieder | 2010-06-28 | 1 | -18/+54 |
| * | | | | | | | | | Merge branch 'wp/merge-tree-fix' | Junio C Hamano | 2010-07-15 | 1 | -0/+257 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | merge-tree: fix where two branches share no changes | Will Palmer | 2010-07-14 | 1 | -3/+3 |
| | * | | | | | | | | | add basic tests for merge-tree | Will Palmer | 2010-07-14 | 1 | -0/+257 |
| | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'js/merge-rr-fix' | Junio C Hamano | 2010-07-15 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | MERGE_RR is in .git, not .git/rr-cache | Jay Soffian | 2010-07-14 | 1 | -2/+2 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'jn/tests' | Junio C Hamano | 2010-07-15 | 1 | -47/+42 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | t3000 (ls-files -o): modernize style | Jonathan Nieder | 2010-07-11 | 1 | -47/+42 |
| * | | | | | | | | | | Merge branch 'jn/grep-open' | Junio C Hamano | 2010-07-15 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | grep -O: Do not pass color sequences as filenames to pager | Nazri Ramliy | 2010-07-07 | 1 | -0/+15 |
| * | | | | | | | | | | | Merge branch 'jc/rebase-i-commit-msg-fix' | Junio C Hamano | 2010-07-15 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | rebase-i: do not get fooled by a log message ending with backslash | Junio C Hamano | 2010-07-05 | 1 | -0/+18 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |