Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/maint-apply-report-offset' | Junio C Hamano | 2011-03-15 | 1 | -2/+14 |
|\ | |||||
| * | apply -v: show offset count when patch did not apply exactly | Junio C Hamano | 2011-03-06 | 1 | -2/+14 |
* | | Merge branch 'jc/maint-apply-no-double-patch' | Junio C Hamano | 2011-03-15 | 1 | -1/+6 |
|\ \ | |||||
| * | | apply: do not patch lines that were already patched | Junio C Hamano | 2011-03-04 | 1 | -1/+6 |
| |/ | |||||
* | | Merge branch 'js/cherry-pick-usability' | Junio C Hamano | 2011-03-09 | 3 | -95/+143 |
|\ \ | |||||
| * | | Teach commit about CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 2 | -97/+114 |
| * | | Introduce CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 3 | -2/+33 |
* | | | Merge branch 'maint' | Junio C Hamano | 2011-03-04 | 1 | -7/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | init: remove unnecessary check | Nguyễn Thái Ngọc Duy | 2011-03-03 | 1 | -7/+5 |
* | | | Merge branch 'jn/maint-commit-missing-template' | Junio C Hamano | 2011-03-04 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | commit: error out for missing commit message template | Jonathan Nieder | 2011-02-25 | 1 | -1/+1 |
| * | | | Merge branch 'ak/describe-exact' into maint | Junio C Hamano | 2011-01-19 | 1 | -25/+60 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'lt/rename-no-extra-copy-detection' | Junio C Hamano | 2011-03-04 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | for_each_hash: allow passing a 'void *data' pointer to callback | Linus Torvalds | 2011-02-18 | 1 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jk/fail-null-clone' | Junio C Hamano | 2011-03-04 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | clone: die when trying to clone missing local path | Jeff King | 2011-02-18 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | 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 'jh/push-default-upstream-configname' | Junio C Hamano | 2011-02-27 | 1 | -5/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | push.default: Rename 'tracking' to 'upstream' | Johan Herland | 2011-02-16 | 1 | -5/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'lp/config-vername-check' | Junio C Hamano | 2011-02-27 | 1 | -7/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Sanity-check config variable names | Libor Pechacek | 2011-02-22 | 1 | -7/+20 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'mg/placeholders-are-lowercase' | Junio C Hamano | 2011-02-27 | 8 | -25/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make <identifier> lowercase as per CodingGuidelines | Michael J Gruber | 2011-02-15 | 8 | -25/+25 |
* | | | | | | | Merge branch 'mg/patch-id' | Junio C Hamano | 2011-02-27 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-patch-id: do not trip over "no newline" markers | Michael J Gruber | 2011-02-17 | 1 | -0/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mz/rerere-remaining' | Junio C Hamano | 2011-02-27 | 1 | -2/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rerere "remaining" | Martin von Zweigbergk | 2011-02-16 | 1 | -2/+12 |
* | | | | | | | | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' | Junio C Hamano | 2011-02-27 | 1 | -8/+29 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge: honor prepare-commit-msg hook | Jay Soffian | 2011-02-15 | 1 | -8/+29 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/hash-object-sanity' | Junio C Hamano | 2011-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make hash-object more robust against malformed objects | Nguyễn Thái Ngọc Duy | 2011-02-07 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'uk/checkout-ambiguous-ref' | Junio C Hamano | 2011-02-27 | 1 | -105/+155 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | checkout: rearrange update_refs_for_switch for clarity | Jonathan Nieder | 2011-02-08 | 1 | -14/+13 |
| * | | | | | | | | | checkout: introduce --detach synonym for "git checkout foo^{commit}" | Junio C Hamano | 2011-02-08 | 1 | -5/+20 |
| * | | | | | | | | | checkout: split off a function to peel away branchname arg | Jonathan Nieder | 2011-02-08 | 1 | -98/+131 |
| * | | | | | | | | | checkout: fix bug with ambiguous refs | Junio C Hamano | 2011-01-11 | 1 | -10/+13 |
* | | | | | | | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-02-27 | 7 | -163/+65 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | grep: drop pathspec_matches() in favor of tree_entry_interesting() | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -111/+14 |
| * | | | | | | | | | grep: use writable strbuf from caller for grep_tree() | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -27/+24 |
| * | | | | | | | | | grep: use match_pathspec_depth() for cache/worktree grepping | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -1/+1 |
| * | | | | | | | | | grep: convert to use struct pathspec | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -14/+16 |
| * | | | | | | | | | Convert ce_path_match() to use struct pathspec | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -2/+6 |
| * | | | | | | | | | struct rev_info: convert prune_data to struct pathspec | Nguyễn Thái Ngọc Duy | 2011-02-03 | 3 | -10/+6 |
| * | | | | | | | | | Convert struct diff_options to use struct pathspec | Nguyễn Thái Ngọc Duy | 2011-02-03 | 3 | -4/+4 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | git-add: make -A description clearer vs. -u | Michael J Gruber | 2011-02-27 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | branch_merged: fix grammar in warning | Eric Hanchrow | 2011-02-27 | 1 | -1/+1 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | checkout: add missing const to describe_detached_head | Jonathan Nieder | 2011-02-22 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-02-15 | 7 | -15/+15 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |