Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kk/maint-commit-tree' into maint | Junio C Hamano | 2012-07-30 | 1 | -0/+17 |
|\ | |||||
| * | Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree | Junio C Hamano | 2012-07-17 | 1 | -0/+17 |
| |\ | |||||
| | * | commit-tree: resurrect command line parsing updates | Junio C Hamano | 2012-07-17 | 1 | -0/+17 |
* | | | Merge branch 'jv/maint-no-ext-diff' into maint | Junio C Hamano | 2012-07-30 | 1 | -0/+59 |
|\ \ \ | |||||
| * | | | diff: test precedence of external diff drivers | Jeff King | 2012-07-19 | 1 | -0/+40 |
| * | | | diff: correctly disable external_diff with --no-ext-diff | Junio C Hamano | 2012-07-17 | 1 | -0/+19 |
* | | | | Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maint | Junio C Hamano | 2012-07-30 | 1 | -0/+13 |
|\ \ \ \ | |||||
| * | | | | submodules: don't stumble over symbolic links when cloning recursively | Jens Lehmann | 2012-07-12 | 1 | -0/+13 |
* | | | | | Merge branch 'jc/maint-filter-branch-epoch-date' into maint | Junio C Hamano | 2012-07-30 | 2 | -3/+13 |
|\ \ \ \ \ | |||||
| * | | | | | t7003: add test to filter a branch with a commit at epoch | Junio C Hamano | 2012-07-12 | 2 | -3/+13 |
* | | | | | | Merge branch 'cw/amend-commit-without-message' into maint | Junio C Hamano | 2012-07-22 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow edit of empty message with commit --amend | Chris Webb | 2012-07-09 | 1 | -0/+15 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/maint-commit-amend-only-no-paths' into maint | Junio C Hamano | 2012-07-22 | 1 | -0/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit: fix "--amend --only" with no pathspec | Jeff King | 2012-07-10 | 1 | -0/+10 |
* | | | | | | | Merge branch 'tg/maint-cache-name-compare' into maint | Junio C Hamano | 2012-07-22 | 1 | -0/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cache_name_compare(): do not truncate while comparing paths | Junio C Hamano | 2012-07-11 | 1 | -0/+39 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'tr/maint-show-walk' into maint | Junio C Hamano | 2012-07-22 | 1 | -0/+91 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | show: fix "range implies walking" | Junio C Hamano | 2012-06-19 | 1 | -2/+2 |
| * | | | | | | | Demonstrate git-show is broken with ranges | Thomas Rast | 2012-06-19 | 1 | -0/+91 |
* | | | | | | | | Merge branch 'jc/refactor-diff-stdin' into maint | Junio C Hamano | 2012-07-22 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff-index.c: "git diff" has no need to read blob from the standard input | Junio C Hamano | 2012-06-28 | 1 | -0/+12 |
* | | | | | | | | | Merge branch 'mz/empty-rebase-test' into maint | Junio C Hamano | 2012-07-22 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | add test case for rebase of empty commit | Martin von Zweigbergk | 2012-06-27 | 1 | -0/+8 |
* | | | | | | | | | | Merge branch 'js/fast-export-paths-with-spaces' into maint | Junio C Hamano | 2012-07-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fast-export: quote paths with spaces | Jay Soffian | 2012-06-27 | 1 | -1/+1 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'cw/no-detaching-an-unborn' into maint | Junio C Hamano | 2012-07-22 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-checkout: disallow --detach on unborn branch | Chris Webb | 2012-06-26 | 1 | -0/+6 |
* | | | | | | | | | | | Merge branch 'vr/use-our-perl-in-tests' into maint | Junio C Hamano | 2012-07-22 | 26 | -44/+65 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t/README: add a bit more Don'ts | Junio C Hamano | 2012-06-24 | 1 | -3/+22 |
| * | | | | | | | | | | | tests: enclose $PERL_PATH in double quotes | Junio C Hamano | 2012-06-24 | 24 | -41/+41 |
| * | | | | | | | | | | | t/test-lib.sh: export PERL_PATH for use in scripts | Junio C Hamano | 2012-06-24 | 1 | -0/+2 |
| * | | | | | | | | | | | t: Replace 'perl' by $PERL_PATH | Vincent van Ravesteijn | 2012-06-12 | 24 | -41/+41 |
* | | | | | | | | | | | | Merge branch 'th/diff-no-index-fixes' into maint | Junio C Hamano | 2012-07-11 | 2 | -2/+86 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds ch... | Tim Henigan | 2012-06-22 | 1 | -1/+72 |
| * | | | | | | | | | | | | diff: handle relative paths in no-index | Jeff King | 2012-06-22 | 1 | -1/+14 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'nd/clone-single-fix' into maint | Junio C Hamano | 2012-07-11 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | clone: fix ref selection in --single-branch --branch=xxx | Nguyễn Thái Ngọc Duy | 2012-06-22 | 1 | -1/+6 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge branch 'ef/maint-rebase-error-message' into maint | Junio C Hamano | 2012-06-03 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/maint-grep-F' into maint | Junio C Hamano | 2012-06-01 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/ident-split-fix' into maint | Junio C Hamano | 2012-06-01 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'hv/submodule-alt-odb' into maint | Junio C Hamano | 2012-05-25 | 1 | -0/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bp/diff-no-index-strbuf-fix' into maint | Junio C Hamano | 2012-05-25 | 1 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-status-porcelain-z-b' into maint | Junio C Hamano | 2012-05-24 | 1 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/verify-filename-fix' into maint | Junio C Hamano | 2012-07-11 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | verify_filename(): ask the caller to chose the kind of diagnosis | Matthieu Moy | 2012-06-18 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | sha1_name: do not trigger detailed diagnosis for file arguments | Matthieu Moy | 2012-06-18 | 1 | -0/+11 |
* | | | | | | | | | | | | | | | | | | | Documentation: Fix misspellings | Leila Muhtasib | 2012-06-22 | 2 | -3/+3 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'as/diff-shortstat-ignore-binary' | Junio C Hamano | 2012-06-15 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | diff: Only count lines in show_shortstats | Alexander Strasser | 2012-06-15 | 1 | -0/+12 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rj/gitweb-test-sans-date-parser' | Junio C Hamano | 2012-06-13 | 1 | -7/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |