summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Fix an incorrect reference to --set-all.jv/maint-config-setJelmer Vernooij2011-12-271-1/+1
* config: Give error message when not changing a multivarMichael J Gruber2011-05-171-1/+6
* Merge branch 'ci/commit--interactive-atomic'Junio C Hamano2011-05-162-15/+37
|\
| * Add support for -p/--patch to git-commitConrad Irwin2011-05-092-6/+10
| * Allow git commit --interactive with pathsConrad Irwin2011-05-091-2/+0
| * Use a temporary index for git commit --interactiveConrad Irwin2011-05-081-8/+28
* | Merge branch 'mg/merge-ff-config'Junio C Hamano2011-05-161-0/+9
|\ \
| * | merge: introduce merge.ff configuration variableJunio C Hamano2011-05-061-0/+9
| * | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano2011-05-061-15/+26
| |/
* | Merge branch 'maint'Junio C Hamano2011-05-141-2/+2
|\ \
| * | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-141-2/+2
| * | Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-131-1/+1
| |\ \
* | \ \ Merge branch 'bf/commit-template-no-cleanup'Junio C Hamano2011-05-131-1/+3
|\ \ \ \
| * | | | Do not strip empty lines / trailing spaces from a commit message templateBoris Faure2011-05-111-1/+3
| |/ / /
| * | | Merge branch 'jc/pack-objects-bigfile' into maintJunio C Hamano2011-05-041-2/+6
| |\ \ \
| * \ \ \ Merge branch 'mg/reflog-with-options' into maintJunio C Hamano2011-05-041-13/+17
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge branch 'rr/rerere-libify-clear-gc'Junio C Hamano2011-05-131-75/+2
|\ \ \ \ \
| * | | | | rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-081-75/+2
* | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano2011-05-131-0/+5
* | | | | | Merge branch 'jc/fix-add-u-unmerged'Junio C Hamano2011-05-131-22/+23
|\ \ \ \ \ \
| * | | | | | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-231-22/+23
* | | | | | | Merge branch 'cn/log-parse-opt'Junio C Hamano2011-05-131-30/+44
|\ \ \ \ \ \ \
| * | | | | | | log: convert to parse-optionsCarlos Martín Nieto2011-04-141-30/+43
* | | | | | | | Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-111-15/+26
* | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks'Junio C Hamano2011-05-111-3/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | "add -p": work-around an old laziness that does not coalesce hunksJunio C Hamano2011-04-291-3/+6
* | | | | | | | | Merge branch 'js/blame-parsename'Junio C Hamano2011-05-061-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-291-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-065-17/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | pathspec: rename per-item field has_wildcard to use_wildcardJunio C Hamano2011-04-052-2/+3
| * | | | | | | | Improve tree_entry_interesting() handling codeNguyễn Thái Ngọc Duy2011-03-251-6/+6
| * | | | | | | | Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-254-11/+19
* | | | | | | | | Merge branch 'mg/rev-list-count-cherry'Junio C Hamano2011-05-041-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rev-list --count: separate count for --cherry-markMichael J Gruber2011-04-261-2/+8
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'vr/merge-base-doc'Junio C Hamano2011-05-041-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: update to git-merge-base --octopusVincent van Ravesteijn2011-04-151-1/+2
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'jc/index-update-if-able' into maintJunio C Hamano2011-04-032-13/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'lt/default-abbrev' into maintJunio C Hamano2011-04-031-1/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mm/maint-log-n-with-diff-filtering' into maintJunio C Hamano2011-04-031-1/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'lp/config-vername-check' into maintJunio C Hamano2011-04-031-7/+20
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-apply-report-offset' into maintJunio C Hamano2011-04-011-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-apply-no-double-patch' into maintJunio C Hamano2011-04-011-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge "checkout ambiguous ref bugfix" into maintJunio C Hamano2011-04-011-10/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-021-10/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | notes: make expand_notes_ref globally accessibleJeff King2011-03-291-10/+0
* | | | | | | | | | | | | | | | Merge branch 'ab/i18n-fixup'Junio C Hamano2011-05-024-20/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | i18n: mark init-db messages for translationÆvar Arnfjörð Bjarmason2011-04-121-5/+5
| * | | | | | | | | | | | | | | | i18n: mark checkout plural warning for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+15
| * | | | | | | | | | | | | | | | i18n: mark checkout --detach messages for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+3
| * | | | | | | | | | | | | | | | i18n: mark clone nonexistent repository message for translationÆvar Arnfjörð Bjarmason2011-04-121-1/+1
View Lorry Controller Status