aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jk/maint-status-porcelain-z-b' into HEADJeff King2012-05-08
|\
| * status: respect "-b" for porcelain formatJeff King2012-05-08
| * status: refactor null_termination optionJeff King2012-05-08
| * commit: refactor option parsingJeff King2012-05-08
| * Merge branch 'jc/merge-reduce-parents-early' into maintJunio C Hamano2012-05-03
| |\
| * \ Merge branch 'cb/cherry-pick-rev-path-confusion' into maintJunio C Hamano2012-05-03
| |\ \
| * \ \ Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintJunio C Hamano2012-05-03
| |\ \ \
| * \ \ \ Merge branch 'it/fetch-pack-many-refs' into maintJunio C Hamano2012-05-01
| |\ \ \ \
| * \ \ \ \ Merge branch 'jl/maint-submodule-recurse-fetch' into maintJunio C Hamano2012-05-01
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/maint-blame-minimal' into maintJunio C Hamano2012-05-01
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2012-04-26
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-26
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-26
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-26
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-push-progress'Junio C Hamano2012-05-03
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | teach send-pack about --[no-]progressJeff King2012-05-01
| * | | | | | | | | | | | send-pack: show progress when isatty(2)Jeff King2012-05-01
* | | | | | | | | | | | | Merge branch 'nd/columns'Junio C Hamano2012-05-03
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tag: add --columnNguyễn Thái Ngọc Duy2012-04-27
| * | | | | | | | | | | | | status: add --columnNguyễn Thái Ngọc Duy2012-04-27
| * | | | | | | | | | | | | branch: add --columnNguyễn Thái Ngọc Duy2012-04-27
| * | | | | | | | | | | | | help: reuse print_columns() for help -aNguyễn Thái Ngọc Duy2012-04-27
| * | | | | | | | | | | | | Add column layout skeleton and git-columnNguyễn Thái Ngọc Duy2012-04-27
* | | | | | | | | | | | | | Merge branch 'pw/message-cleanup'Junio C Hamano2012-05-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remove superfluous newlines in error messagesPete Wyckoff2012-04-30
* | | | | | | | | | | | | | | Merge branch 'ab/i18n'Junio C Hamano2012-05-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-commit: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-30
| * | | | | | | | | | | | | | | git-commit: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-30
| * | | | | | | | | | | | | | | git-branch: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-30
* | | | | | | | | | | | | | | | Merge branch 'nd/i18n'Junio C Hamano2012-05-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | help: replace underlining "help -a" headers using hyphens with a blank lineNguyễn Thái Ngọc Duy2012-04-25
| * | | | | | | | | | | | | | | | i18n: index-pack: mark strings for translationNguyễn Thái Ngọc Duy2012-04-24
| * | | | | | | | | | | | | | | | i18n: apply: update say_patch_name to give translators complete sentenceNguyễn Thái Ngọc Duy2012-04-24
| * | | | | | | | | | | | | | | | i18n: apply: mark strings for translationNguyễn Thái Ngọc Duy2012-04-24
| * | | | | | | | | | | | | | | | i18n: remote: mark strings for translationNguyễn Thái Ngọc Duy2012-04-24
| * | | | | | | | | | | | | | | | i18n: make warn_dangling_symref() automatically append \nNguyễn Thái Ngọc Duy2012-04-24
| * | | | | | | | | | | | | | | | i18n: help: mark strings for translationNguyễn Thái Ngọc Duy2012-04-24
* | | | | | | | | | | | | | | | | Merge branch 'mm/simple-push'Junio C Hamano2012-05-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | push: introduce new push.default mode "simple"Matthieu Moy2012-04-24
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jc/index-v4'Junio C Hamano2012-05-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | update-index: upgrade/downgrade on-disk index versionJunio C Hamano2012-04-04
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | git-cherry-pick: Add keep-redundant-commits optionNeil Horman2012-04-24
| * | | | | | | | | | | | | | | git-cherry-pick: add allow-empty optionNeil Horman2012-04-11
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jk/repack-no-explode-objects-from-old-pack'Junio C Hamano2012-04-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gc: use argv-array for sub-commandsJeff King2012-04-18
| * | | | | | | | | | | | | | | gc: do not explode objects which will be immediately prunedJeff King2012-04-11
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-18
| * | | | | | | | | | | | | | builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-17