Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2011-03-10 | 5 | -21/+1 |
|\ | |||||
| * | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" | Junio C Hamano | 2011-03-10 | 5 | -21/+1 |
* | | Update Release Notes to 1.7.5 | Junio C Hamano | 2011-03-09 | 1 | -3/+27 |
* | | Merge branch 'js/cherry-pick-usability' | Junio C Hamano | 2011-03-09 | 12 | -156/+308 |
|\ \ | |||||
| * | | Teach commit about CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 7 | -104/+158 |
| * | | bash: teach __git_ps1 about CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 1 | -0/+2 |
| * | | Introduce CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 7 | -4/+132 |
| * | | t3507: introduce pristine-detach helper | Jonathan Nieder | 2011-02-21 | 1 | -54/+22 |
* | | | Merge branch 'js/checkout-untracked-symlink' | Junio C Hamano | 2011-03-09 | 3 | -4/+62 |
|\ \ \ | |||||
| * | | | do not overwrite untracked symlinks | Clemens Buchacher | 2011-02-21 | 2 | -4/+12 |
| * | | | Demonstrate breakage: checkout overwrites untracked symlink with directory | Johannes Sixt | 2011-02-15 | 1 | -0/+50 |
| |/ / | |||||
* | | | Merge branch 'so/submodule-no-update-first-time' | Junio C Hamano | 2011-03-09 | 2 | -0/+61 |
|\ \ \ | |||||
| * | | | t7406: "git submodule update {--merge|--rebase]" with new submodules | Spencer E. Olson | 2011-02-17 | 1 | -0/+52 |
| * | | | submodule: no [--merge|--rebase] when newly cloned | Spencer E. Olson | 2011-02-17 | 1 | -0/+9 |
| |/ / | |||||
* | | | Merge branch 'maint' | Junio C Hamano | 2011-03-09 | 3 | -5/+17 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix typo in t/README | Mathias Lafeldt | 2011-03-09 | 1 | -1/+1 |
| * | | ls-remote documentation: <refs> argument is optional | Piotr Krukowiecki | 2011-03-09 | 1 | -1/+1 |
| * | | Add Author and Documentation sections to git-for-each-ref.txt | Alexei Sholik | 2011-03-09 | 1 | -0/+12 |
| * | | Documentation: remove redundant colons in git-for-each-ref.txt | Alexei Sholik | 2011-03-09 | 1 | -3/+3 |
* | | | Merge branch 'maint' | Junio C Hamano | 2011-03-08 | 3 | -13/+26 |
|\ \ \ | |/ / | |||||
| * | | SubmittingPatches: clarify the expected commit log description | Junio C Hamano | 2011-03-08 | 1 | -8/+18 |
| * | | diff format documentation: clarify --cc and -c | Adam Monsen | 2011-03-08 | 1 | -4/+7 |
| * | | rev-list-options.txt: typo fix | Michael J Gruber | 2011-03-08 | 1 | -1/+1 |
* | | | transport-helper.c: fix check for (size_t < 0) | Nicolas Kaiser | 2011-03-08 | 1 | -1/+1 |
* | | | Merge branch 'maint' | Junio C Hamano | 2011-03-04 | 2 | -8/+6 |
|\ \ \ | |/ / | |||||
| * | | Documentation: fix a typo in git-apply.txt | Michał Kiedrowicz | 2011-03-04 | 1 | -1/+1 |
| * | | init: remove unnecessary check | Nguyễn Thái Ngọc Duy | 2011-03-03 | 1 | -7/+5 |
* | | | Merge branch 'mh/p4' | Junio C Hamano | 2011-03-04 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | git-p4 submit: prevent 'Jobs' section from being removed from p4 change log | Michael Horowitz | 2011-02-25 | 1 | -1/+1 |
* | | | | Merge branch 'mg/maint-difftool-vim-readonly' | Junio C Hamano | 2011-03-04 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | mergetool-lib: call vim in readonly mode for diffs | Michael J Gruber | 2011-02-25 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jn/maint-commit-missing-template' | Junio C Hamano | 2011-03-04 | 2 | -4/+12 |
|\ \ \ \ | |||||
| * | | | | commit: error out for missing commit message template | Jonathan Nieder | 2011-02-25 | 2 | -4/+12 |
* | | | | | Merge branch 'jk/diffstat-binary' | Junio C Hamano | 2011-03-04 | 2 | -10/+28 |
|\ \ \ \ \ | |||||
| * | | | | | diff: don't retrieve binary blobs for diffstat | Jeff King | 2011-02-22 | 1 | -4/+11 |
| * | | | | | diff: handle diffstat of rewritten binary files | Jeff King | 2011-02-22 | 2 | -10/+21 |
* | | | | | | Merge branch 'lt/rename-no-extra-copy-detection' | Junio C Hamano | 2011-03-04 | 9 | -45/+46 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diffcore-rename: improve estimate_similarity() heuristics | Linus Torvalds | 2011-02-18 | 1 | -1/+1 |
| * | | | | | | diffcore-rename: properly honor the difference between -M and -C | Linus Torvalds | 2011-02-18 | 6 | -33/+32 |
| * | | | | | | for_each_hash: allow passing a 'void *data' pointer to callback | Linus Torvalds | 2011-02-18 | 4 | -11/+13 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jn/test-terminal-punt-on-osx-breakage' | Junio C Hamano | 2011-03-04 | 1 | -3/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tests: skip terminal output tests on OS X | Jonathan Nieder | 2011-02-17 | 1 | -3/+19 |
* | | | | | | | Merge branch 'jk/fail-null-clone' | Junio C Hamano | 2011-03-04 | 2 | -1/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | clone: die when trying to clone missing local path | Jeff King | 2011-02-18 | 2 | -1/+14 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/grep--no-index-pathspec-fix' | Junio C Hamano | 2011-03-04 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | grep --no-index: honor pathspecs correctly | Junio C Hamano | 2011-02-16 | 1 | -0/+4 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-03-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | verify-pack: add --stat-only to the synopsis section | Junio C Hamano | 2011-03-01 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'svn-fe' of git://repo.or.cz/git/jrn | Junio C Hamano | 2011-02-28 | 18 | -233/+1571 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fast-import: make code "-Wpointer-arith" clean | Jonathan Nieder | 2011-02-28 | 1 | -1/+1 |