summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* builtin/diff.c: remove duplicated call to diff_result_code()Junio C Hamano2011-03-221-3/+1
* Fix sparse warningsStephen Boyd2011-03-2220-29/+22
* Merge branch 'mm/maint-log-n-with-diff-filtering'Junio C Hamano2011-03-191-1/+7
|\
| * log: fix --max-count when used together with -S or -GMatthieu Moy2011-03-091-1/+7
* | Merge branch 'js/rerere-forget-always-take-pathspec'Junio C Hamano2011-03-191-2/+5
|\ \
| * | rerere forget: deprecate invocation without pathspecJohannes Sixt2011-03-021-2/+5
* | | Merge branch 'uk/ls-remote-in-get-remote-url'Junio C Hamano2011-03-191-0/+11
|\ \ \
| * | | get_remote_url(): use the same data source as ls-remote to get remote urlsUwe Kleine-König2011-03-021-0/+11
* | | | Merge branch 'jn/status-translatable'Junio C Hamano2011-03-191-29/+30
|\ \ \ \
| * | | | commit, status: use status_printf{,_ln,_more} helpersJonathan Nieder2011-03-081-23/+24
| * | | | commit: refer to commit template as s->fpJonathan Nieder2011-03-081-14/+13
* | | | | Merge branch 'jk/trace-sifter'Junio C Hamano2011-03-195-0/+8
|\ \ \ \ \
| * | | | | add packet tracing debug codeJeff King2011-03-085-0/+8
| |/ / / /
* | | | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-192-1/+7
|\ \ \ \ \
| * | | | | merge: enable progress reporting for rename detectionJeff King2011-02-211-0/+7
| * | | | | commit: stop setting rename limitJeff King2011-02-211-1/+0
| | |/ / / | |/| | |
* | | | | grep: read patterns from stdin with -f -René Scharfe2011-03-191-2/+4
* | | | | Name make_*_path functions more accuratelyCarlos Martín Nieto2011-03-173-10/+10
* | | | | 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
| |/ / / / / / / / / /