aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'cn/log-parse-opt'Junio C Hamano2011-05-13
|\
| * log: convert to parse-optionsCarlos Martín Nieto2011-04-14
* | Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-11
* | Merge branch 'jc/maint-add-p-overlapping-hunks'Junio C Hamano2011-05-11
|\ \
| * | "add -p": work-around an old laziness that does not coalesce hunksJunio C Hamano2011-04-29
* | | Merge branch 'js/blame-parsename'Junio C Hamano2011-05-06
|\ \ \
| * | | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-29
* | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-06
|\ \ \ \
| * | | | pathspec: rename per-item field has_wildcard to use_wildcardJunio C Hamano2011-04-05
| * | | | Improve tree_entry_interesting() handling codeNguyễn Thái Ngọc Duy2011-03-25
| * | | | Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-25
* | | | | Merge branch 'mg/rev-list-count-cherry'Junio C Hamano2011-05-04
|\ \ \ \ \
| * | | | | rev-list --count: separate count for --cherry-markMichael J Gruber2011-04-26
| | |/ / / | |/| | |
* | | | | Merge branch 'vr/merge-base-doc'Junio C Hamano2011-05-04
|\ \ \ \ \
| * | | | | Documentation: update to git-merge-base --octopusVincent van Ravesteijn2011-04-15
| | |_|_|/ | |/| | |
| * | | | Merge branch 'jc/index-update-if-able' into maintJunio C Hamano2011-04-03
| |\ \ \ \
| * \ \ \ \ Merge branch 'lt/default-abbrev' into maintJunio C Hamano2011-04-03
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mm/maint-log-n-with-diff-filtering' into maintJunio C Hamano2011-04-03
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'lp/config-vername-check' into maintJunio C Hamano2011-04-03
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-apply-report-offset' into maintJunio C Hamano2011-04-01
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-apply-no-double-patch' into maintJunio C Hamano2011-04-01
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge "checkout ambiguous ref bugfix" into maintJunio C Hamano2011-04-01
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-02
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | notes: make expand_notes_ref globally accessibleJeff King2011-03-29
* | | | | | | | | | | | Merge branch 'ab/i18n-fixup'Junio C Hamano2011-05-02
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | i18n: mark init-db messages for translationÆvar Arnfjörð Bjarmason2011-04-12
| * | | | | | | | | | | | i18n: mark checkout plural warning for translationÆvar Arnfjörð Bjarmason2011-04-12
| * | | | | | | | | | | | i18n: mark checkout --detach messages for translationÆvar Arnfjörð Bjarmason2011-04-12
| * | | | | | | | | | | | i18n: mark clone nonexistent repository message for translationÆvar Arnfjörð Bjarmason2011-04-12
| * | | | | | | | | | | | i18n: mark merge CHERRY_PICK_HEAD messages for translationÆvar Arnfjörð Bjarmason2011-04-12
| * | | | | | | | | | | | i18n: mark merge "upstream" messages for translationÆvar Arnfjörð Bjarmason2011-04-12
| * | | | | | | | | | | | i18n: mark merge "Could not read from" message for translationÆvar Arnfjörð Bjarmason2011-04-12
* | | | | | | | | | | | | Merge branch 'jh/notes-add-ui'Junio C Hamano2011-05-02
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make "git notes add" more user-friendly when there are existing notesJohan Herland2011-03-30
* | | | | | | | | | | | | | Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano2011-04-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge branch 'cn/format-patch-quiet'Junio C Hamano2011-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | format-patch: don't pass on the --quiet flagCarlos Martín Nieto2011-04-12
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jc/merge-dash-previous'Junio C Hamano2011-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | merge: allow "-" as a short-hand for "previous branch"Junio C Hamano2011-04-07
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'rj/sparse'Junio C Hamano2011-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones2011-04-11
| * | | | | | | | | | | | | | | sparse: Fix an "symbol 'format_subject' not declared" warningRamsay Jones2011-04-11
| * | | | | | | | | | | | | | | sparse: Fix an "symbol 'cmd_index_pack' not declared" warningRamsay Jones2011-04-11
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'nk/blame-abbrev'Junio C Hamano2011-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | blame: add --abbrev command line option and make it honor core.abbrevNamhyung Kim2011-04-05
* | | | | | | | | | | | | | | | Merge branch 'dm/color-palette'Junio C Hamano2011-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Share color list between graph and show-branchDan McGee2011-04-04
* | | | | | | | | | | | | | | | | Merge branch 'jc/pack-objects-bigfile'Junio C Hamano2011-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \