summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-apply-report-offset'Junio C Hamano2011-03-151-2/+14
|\
| * apply -v: show offset count when patch did not apply exactlyJunio C Hamano2011-03-061-2/+14
* | Merge branch 'jc/maint-apply-no-double-patch'Junio C Hamano2011-03-151-1/+6
|\ \
| * | apply: do not patch lines that were already patchedJunio C Hamano2011-03-041-1/+6
| |/
* | Merge branch 'js/cherry-pick-usability'Junio C Hamano2011-03-093-95/+143
|\ \
| * | Teach commit about CHERRY_PICK_HEADJay Soffian2011-02-212-97/+114
| * | Introduce CHERRY_PICK_HEADJay Soffian2011-02-213-2/+33
* | | Merge branch 'maint'Junio C Hamano2011-03-041-7/+5
|\ \ \ | | |/ | |/|
| * | init: remove unnecessary checkNguyễn Thái Ngọc Duy2011-03-031-7/+5
* | | Merge branch 'jn/maint-commit-missing-template'Junio C Hamano2011-03-041-1/+1
|\ \ \
| * | | commit: error out for missing commit message templateJonathan Nieder2011-02-251-1/+1
| * | | Merge branch 'ak/describe-exact' into maintJunio C Hamano2011-01-191-25/+60
| |\ \ \
* | \ \ \ Merge branch 'lt/rename-no-extra-copy-detection'Junio C Hamano2011-03-041-2/+2
|\ \ \ \ \
| * | | | | for_each_hash: allow passing a 'void *data' pointer to callbackLinus Torvalds2011-02-181-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/fail-null-clone'Junio C Hamano2011-03-041-1/+1
|\ \ \ \ \
| * | | | | clone: die when trying to clone missing local pathJeff King2011-02-181-1/+1
| |/ / / /
* | | | | Merge branch 'jc/grep--no-index-pathspec-fix'Junio C Hamano2011-03-041-0/+4
|\ \ \ \ \
| * | | | | grep --no-index: honor pathspecs correctlyJunio C Hamano2011-02-161-0/+4
* | | | | | Merge branch 'jh/push-default-upstream-configname'Junio C Hamano2011-02-271-5/+5
|\ \ \ \ \ \
| * | | | | | push.default: Rename 'tracking' to 'upstream'Johan Herland2011-02-161-5/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'lp/config-vername-check'Junio C Hamano2011-02-271-7/+20
|\ \ \ \ \ \
| * | | | | | Sanity-check config variable namesLibor Pechacek2011-02-221-7/+20
| |/ / / / /
* | | | | | Merge branch 'mg/placeholders-are-lowercase'Junio C Hamano2011-02-278-25/+25
|\ \ \ \ \ \
| * | | | | | Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber2011-02-158-25/+25
* | | | | | | Merge branch 'mg/patch-id'Junio C Hamano2011-02-271-0/+2
|\ \ \ \ \ \ \
| * | | | | | | git-patch-id: do not trip over "no newline" markersMichael J Gruber2011-02-171-0/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mz/rerere-remaining'Junio C Hamano2011-02-271-2/+12
|\ \ \ \ \ \ \
| * | | | | | | rerere "remaining"Martin von Zweigbergk2011-02-161-2/+12
* | | | | | | | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'Junio C Hamano2011-02-271-8/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: honor prepare-commit-msg hookJay Soffian2011-02-151-8/+29
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/hash-object-sanity'Junio C Hamano2011-02-271-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Make hash-object more robust against malformed objectsNguyễn Thái Ngọc Duy2011-02-071-1/+1
* | | | | | | | | Merge branch 'uk/checkout-ambiguous-ref'Junio C Hamano2011-02-271-105/+155
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: rearrange update_refs_for_switch for clarityJonathan Nieder2011-02-081-14/+13
| * | | | | | | | | checkout: introduce --detach synonym for "git checkout foo^{commit}"Junio C Hamano2011-02-081-5/+20
| * | | | | | | | | checkout: split off a function to peel away branchname argJonathan Nieder2011-02-081-98/+131
| * | | | | | | | | checkout: fix bug with ambiguous refsJunio C Hamano2011-01-111-10/+13
* | | | | | | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-02-277-163/+65
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | grep: drop pathspec_matches() in favor of tree_entry_interesting()Nguyễn Thái Ngọc Duy2011-02-031-111/+14
| * | | | | | | | | grep: use writable strbuf from caller for grep_tree()Nguyễn Thái Ngọc Duy2011-02-031-27/+24
| * | | | | | | | | grep: use match_pathspec_depth() for cache/worktree greppingNguyễn Thái Ngọc Duy2011-02-031-1/+1
| * | | | | | | | | grep: convert to use struct pathspecNguyễn Thái Ngọc Duy2011-02-031-14/+16
| * | | | | | | | | Convert ce_path_match() to use struct pathspecNguyễn Thái Ngọc Duy2011-02-031-2/+6
| * | | | | | | | | struct rev_info: convert prune_data to struct pathspecNguyễn Thái Ngọc Duy2011-02-033-10/+6
| * | | | | | | | | Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy2011-02-033-4/+4
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | git-add: make -A description clearer vs. -uMichael J Gruber2011-02-271-1/+1
* | | | | | | | | Merge branch 'maint'Junio C Hamano2011-02-271-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | branch_merged: fix grammar in warningEric Hanchrow2011-02-271-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | checkout: add missing const to describe_detached_headJonathan Nieder2011-02-221-1/+1
* | | | | | | | Merge branch 'maint'Junio C Hamano2011-02-157-15/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / /