| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'bc/object-id' | Junio C Hamano | 2017-11-06 | 1 | -14/+14 |
| |\ | |||||
| | * | refs: convert resolve_ref_unsafe to struct object_id | brian m. carlson | 2017-10-16 | 1 | -3/+3 |
| | * | refs: convert peel_ref to struct object_id | brian m. carlson | 2017-10-16 | 1 | -3/+3 |
| | * | refs: convert update_ref and refs_update_ref to use struct object_id | brian m. carlson | 2017-10-16 | 1 | -5/+5 |
| | * | refs: convert delete_ref and refs_delete_ref to struct object_id | brian m. carlson | 2017-10-16 | 1 | -3/+3 |
| * | | Merge branch 'ds/find-unique-abbrev-optim' | Junio C Hamano | 2017-11-06 | 1 | -0/+4 |
| |\ \ | |||||
| | * | | p4211-line-log.sh: add log --online --raw --parents perf test | Derrick Stolee | 2017-10-13 | 1 | -0/+4 |
| * | | | Merge branch 'wk/pull-signoff' | Junio C Hamano | 2017-11-06 | 1 | -0/+45 |
| |\ \ \ | |||||
| | * | | | pull: pass --signoff/--no-signoff to "git merge"wk/pull-signoff | W. Trevor King | 2017-10-13 | 1 | -0/+45 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'pb/bisect-helper' | Junio C Hamano | 2017-11-06 | 1 | -0/+17 |
| |\ \ \ | |||||
| | * | | | t6030: explicitly test for bisection cleanup | Pranit Bauva | 2017-10-06 | 1 | -0/+17 |
| * | | | | Merge branch 'dm/run-command-ignored-hook-advise' | Junio C Hamano | 2017-11-06 | 1 | -0/+41 |
| |\ \ \ \ | |||||
| | * | | | | run-command: add hint when a hook is ignoreddm/run-command-ignored-hook-advise | Damien Marié | 2017-10-10 | 1 | -0/+41 |
| | |/ / / | |||||
| * | | | | Merge branch 'ex/deprecate-empty-pathspec-as-match-all' | Junio C Hamano | 2017-11-06 | 3 | -7/+5 |
| |\ \ \ \ | |||||
| | * | | | | pathspec: die on empty strings as pathspecex/deprecate-empty-pathspec-as-match-all | Emily Xie | 2017-06-23 | 2 | -6/+4 |
| | * | | | | t0027: do not use an empty string as a pathspec element | Junio C Hamano | 2017-06-23 | 1 | -1/+1 |
| * | | | | | Merge branch 'jk/rebase-i-exec-gitdir-fix' | Junio C Hamano | 2017-11-06 | 1 | -0/+11 |
| |\ \ \ \ \ | |||||
| | * | | | | | sequencer: pass absolute GIT_DIR to exec commandsjk/rebase-i-exec-gitdir-fix | Jacob Keller | 2017-11-02 | 1 | -0/+11 |
| * | | | | | | Merge branch 'mh/test-local-canary' | Junio C Hamano | 2017-11-06 | 1 | -0/+25 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | t0000: check whether the shell supports the "local" keywordmh/test-local-canary | Michael Haggerty | 2017-10-31 | 1 | -0/+25 |
| * | | | | | | | Merge branch 'js/submodule-in-excluded' | Junio C Hamano | 2017-11-06 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | status: do not get confused by submodules in excluded directoriesjs/submodule-in-excluded | Johannes Schindelin | 2017-10-26 | 1 | -0/+11 |
| * | | | | | | | | Merge branch 'jk/misc-resolve-ref-unsafe-fixes' | Junio C Hamano | 2017-11-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | test-ref-store: avoid passing NULL to printf | Jeff King | 2017-10-21 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'jk/diff-color-moved-fix' | Junio C Hamano | 2017-11-06 | 1 | -36/+177 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | diff: fix whitespace-skipping with --color-moved | Jeff King | 2017-10-21 | 1 | -0/+67 |
| | * | | | | | | | | | t4015: test the output of "diff --color-moved -b" | Jeff King | 2017-10-21 | 1 | -9/+64 |
| | * | | | | | | | | | t4015: check "negative" case for "-w --color-moved" | Jeff King | 2017-10-21 | 1 | -8/+18 |
| | * | | | | | | | | | t4015: refactor --color-moved whitespace test | Jeff King | 2017-10-21 | 1 | -20/+29 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'kd/auto-col-with-pager-fix' | Junio C Hamano | 2017-11-06 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| | * | | | | | | | | column: show auto columns when pager is active | Kevin Daudt | 2017-10-17 | 1 | -0/+14 |
| * | | | | | | | | | Merge branch 'mh/ref-locking-fix' | Junio C Hamano | 2017-10-26 | 1 | -0/+141 |
| |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| | * | | | | | | | | files_transaction_prepare(): fix handling of ref lock failuremh/ref-locking-fix | Michael Haggerty | 2017-10-25 | 1 | -8/+8 |
| | * | | | | | | | | t1404: add a bunch of tests of D/F conflicts | Michael Haggerty | 2017-10-25 | 1 | -0/+141 |
| * | | | | | | | | | Merge branch 'jk/ref-filter-colors-fix' | Junio C Hamano | 2017-10-18 | 3 | -5/+26 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | tag: respect color.ui configjk/ref-filter-colors-fix | Jeff King | 2017-10-17 | 2 | -0/+11 |
| | * | | | | | | | | | Revert "color: check color.ui in git_default_config()" | Jeff King | 2017-10-17 | 1 | -1/+1 |
| | * | | | | | | | | | Revert "t6006: drop "always" color config tests" | Jeff King | 2017-10-17 | 1 | -5/+15 |
| | * | | | | | | | | | Revert "color: make "always" the same as "auto" in config" | Jeff King | 2017-10-17 | 1 | -1/+1 |
| | * | | | | | | | | | Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt... | Junio C Hamano | 2017-10-17 | 12 | -79/+70 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-10-17 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | diff: fix infinite loop with --color-moved --ignore-space-changesb/diff-color-move | Jeff King | 2017-10-16 | 1 | -0/+9 |
| * | | | | | | | | | | | Merge branch 'sb/test-cmp-expect-actual' | Junio C Hamano | 2017-10-11 | 14 | -41/+41 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | tests: fix diff order arguments in test_cmpsb/test-cmp-expect-actual | Stefan Beller | 2017-10-07 | 15 | -42/+42 |
| | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'jk/refs-df-conflict' | Junio C Hamano | 2017-10-11 | 3 | -2/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | refs_resolve_ref_unsafe: handle d/f conflicts for writesjk/refs-df-conflict | Jeff King | 2017-10-07 | 2 | -1/+35 |
| | * | | | | | | | | | | | t3308: create a real ref directory/file conflict | Jeff King | 2017-10-07 | 1 | -1/+1 |
| | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge branch 'rs/fsck-null-return-from-lookup' | Junio C Hamano | 2017-10-11 | 1 | -0/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | fsck: handle NULL return of lookup_blob() and lookup_tree()rs/fsck-null-return-from-lookup | René Scharfe | 2017-10-06 | 1 | -0/+22 |
| | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'tb/show-trailers-in-ref-filter' | Junio C Hamano | 2017-10-11 | 2 | -3/+89 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |