summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2011-03-166-47/+50
|\
| * Merge branch 'jn/maint-commit-missing-template' into maintJunio C Hamano2011-03-161-1/+1
| |\
| * \ Merge branch 'lt/rename-no-extra-copy-detection' into maintJunio C Hamano2011-03-161-2/+2
| |\ \
| * \ \ Merge branch 'jk/fail-null-clone' into maintJunio C Hamano2011-03-161-1/+1
| |\ \ \
| * \ \ \ Merge branch 'jh/push-default-upstream-configname' into maintJunio C Hamano2011-03-161-5/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'mg/placeholders-are-lowercase' into maintJunio C Hamano2011-03-168-25/+25
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mg/patch-id' into maintJunio C Hamano2011-03-161-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maintJunio C Hamano2011-03-161-8/+29
| |\ \ \ \ \ \ \
| * | | | | | | | cherry: split off function to print output linesJonathan Nieder2011-03-161-16/+18
| * | | | | | | | branch: split off function that writes tracking info and commit subjectJonathan Nieder2011-03-161-21/+27
| * | | | | | | | standardize brace placement in struct definitionsJonathan Nieder2011-03-164-10/+5
* | | | | | | | | Merge branch 'mm/push-default-advice'Junio C Hamano2011-03-151-7/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | push: better error message when no remote configuredMatthieu Moy2011-03-021-1/+8
| * | | | | | | | | push: better error messages when push.default = trackingMatthieu Moy2011-03-021-6/+16
* | | | | | | | | | Merge branch 'jc/checkout-orphan-warning'Junio C Hamano2011-03-151-6/+95
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit: give final warning when reattaching HEAD to leave commits behindJunio C Hamano2011-02-231-6/+95
* | | | | | | | | | | 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
View Lorry Controller Status