aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-22
* builtin/diff.c: remove duplicated call to diff_result_code()Junio C Hamano2011-03-22
* Fix sparse warningsStephen Boyd2011-03-22
* Merge branch 'mm/maint-log-n-with-diff-filtering'Junio C Hamano2011-03-19
|\
| * log: fix --max-count when used together with -S or -GMatthieu Moy2011-03-09
* | Merge branch 'js/rerere-forget-always-take-pathspec'Junio C Hamano2011-03-19
|\ \
| * | rerere forget: deprecate invocation without pathspecJohannes Sixt2011-03-02
* | | Merge branch 'uk/ls-remote-in-get-remote-url'Junio C Hamano2011-03-19
|\ \ \
| * | | get_remote_url(): use the same data source as ls-remote to get remote urlsUwe Kleine-König2011-03-02
* | | | Merge branch 'jn/status-translatable'Junio C Hamano2011-03-19
|\ \ \ \
| * | | | commit, status: use status_printf{,_ln,_more} helpersJonathan Nieder2011-03-08
| * | | | commit: refer to commit template as s->fpJonathan Nieder2011-03-08
* | | | | Merge branch 'jk/trace-sifter'Junio C Hamano2011-03-19
|\ \ \ \ \
| * | | | | add packet tracing debug codeJeff King2011-03-08
| |/ / / /
* | | | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-19
|\ \ \ \ \
| * | | | | merge: enable progress reporting for rename detectionJeff King2011-02-21
| * | | | | commit: stop setting rename limitJeff King2011-02-21
| | |/ / / | |/| | |
* | | | | grep: read patterns from stdin with -f -René Scharfe2011-03-19
* | | | | Name make_*_path functions more accuratelyCarlos Martín Nieto2011-03-17
* | | | | Merge branch 'maint'Junio C Hamano2011-03-16
|\ \ \ \ \
| * \ \ \ \ Merge branch 'jn/maint-commit-missing-template' into maintJunio C Hamano2011-03-16
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'lt/rename-no-extra-copy-detection' into maintJunio C Hamano2011-03-16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/fail-null-clone' into maintJunio C Hamano2011-03-16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jh/push-default-upstream-configname' into maintJunio C Hamano2011-03-16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mg/placeholders-are-lowercase' into maintJunio C Hamano2011-03-16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mg/patch-id' into maintJunio C Hamano2011-03-16
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maintJunio C Hamano2011-03-16
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cherry: split off function to print output linesJonathan Nieder2011-03-16
| * | | | | | | | | | | | branch: split off function that writes tracking info and commit subjectJonathan Nieder2011-03-16
| * | | | | | | | | | | | standardize brace placement in struct definitionsJonathan Nieder2011-03-16
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mm/push-default-advice'Junio C Hamano2011-03-15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | push: better error message when no remote configuredMatthieu Moy2011-03-02
| * | | | | | | | | | | | push: better error messages when push.default = trackingMatthieu Moy2011-03-02
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/checkout-orphan-warning'Junio C Hamano2011-03-15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | commit: give final warning when reattaching HEAD to leave commits behindJunio C Hamano2011-02-23
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/maint-apply-report-offset'Junio C Hamano2011-03-15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | apply -v: show offset count when patch did not apply exactlyJunio C Hamano2011-03-06
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/maint-apply-no-double-patch'Junio C Hamano2011-03-15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | apply: do not patch lines that were already patchedJunio C Hamano2011-03-04
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'js/cherry-pick-usability'Junio C Hamano2011-03-09
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Teach commit about CHERRY_PICK_HEADJay Soffian2011-02-21
| * | | | | | | | | | | | Introduce CHERRY_PICK_HEADJay Soffian2011-02-21
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-03-04
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | init: remove unnecessary checkNguyễn Thái Ngọc Duy2011-03-03
* | | | | | | | | | | | Merge branch 'jn/maint-commit-missing-template'Junio C Hamano2011-03-04
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | commit: error out for missing commit message templateJonathan Nieder2011-02-25
| * | | | | | | | | | | Merge branch 'ak/describe-exact' into maintJunio C Hamano2011-01-19
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lt/rename-no-extra-copy-detection'Junio C Hamano2011-03-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | for_each_hash: allow passing a 'void *data' pointer to callbackLinus Torvalds2011-02-18
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/fail-null-clone'Junio C Hamano2011-03-04
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |