summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* apply: refactor "previous patch" logicJunio C Hamano2012-07-091-26/+56
* apply: split load_preimage() helper function outJunio C Hamano2012-07-091-3/+12
* apply: factor out checkout_target() helper functionJunio C Hamano2012-07-091-7/+13
* apply: refactor read_file_or_gitlink()Junio C Hamano2012-07-091-7/+11
* apply: clear_image() clears things a bit moreJunio C Hamano2012-07-091-2/+2
* apply: a bit more comments on PATH_TO_BE_DELETEDJunio C Hamano2012-07-091-2/+8
* apply: fix an incomplete comment in check_patch()Junio C Hamano2012-07-091-9/+15
* Merge branch 'jk/maint-push-progress'Junio C Hamano2012-05-031-0/+13
|\
| * teach send-pack about --[no-]progressJeff King2012-05-011-2/+12
| * send-pack: show progress when isatty(2)Jeff King2012-05-011-0/+3
* | Merge branch 'nd/columns'Junio C Hamano2012-05-035-8/+124
|\ \
| * | tag: add --columnNguyễn Thái Ngọc Duy2012-04-271-3/+24
| * | status: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+7
| * | branch: add --columnNguyễn Thái Ngọc Duy2012-04-271-4/+28
| * | help: reuse print_columns() for help -aNguyễn Thái Ngọc Duy2012-04-271-1/+6
| * | Add column layout skeleton and git-columnNguyễn Thái Ngọc Duy2012-04-271-0/+59
* | | Merge branch 'pw/message-cleanup'Junio C Hamano2012-05-023-4/+4
|\ \ \
| * | | remove superfluous newlines in error messagesPete Wyckoff2012-04-303-4/+4
* | | | Merge branch 'ab/i18n'Junio C Hamano2012-05-022-45/+44
|\ \ \ \
| * | | | git-commit: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-301-7/+6
| * | | | git-commit: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-301-29/+23
| * | | | git-branch: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-301-9/+15
* | | | | Merge branch 'nd/i18n'Junio C Hamano2012-05-025-284/+326
|\ \ \ \ \
| * | | | | help: replace underlining "help -a" headers using hyphens with a blank lineNguyễn Thái Ngọc Duy2012-04-251-1/+1
| * | | | | i18n: index-pack: mark strings for translationNguyễn Thái Ngọc Duy2012-04-241-57/+68
| * | | | | i18n: apply: update say_patch_name to give translators complete sentenceNguyễn Thái Ngọc Duy2012-04-241-12/+20
| * | | | | i18n: apply: mark strings for translationNguyễn Thái Ngọc Duy2012-04-241-83/+91
| * | | | | i18n: remote: mark strings for translationNguyễn Thái Ngọc Duy2012-04-241-106/+121
| * | | | | i18n: make warn_dangling_symref() automatically append \nNguyễn Thái Ngọc Duy2012-04-242-4/+4
| * | | | | i18n: help: mark strings for translationNguyễn Thái Ngọc Duy2012-04-241-24/+24
* | | | | | Merge branch 'mm/simple-push'Junio C Hamano2012-05-021-2/+45
|\ \ \ \ \ \
| * | | | | | push: introduce new push.default mode "simple"Matthieu Moy2012-04-241-2/+45
| |/ / / / /
* | | | | | Merge branch 'jc/index-v4'Junio C Hamano2012-05-021-0/+14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | update-index: upgrade/downgrade on-disk index versionJunio C Hamano2012-04-041-0/+14
* | | | | | Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-301-0/+8
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | git-cherry-pick: Add keep-redundant-commits optionNeil Horman2012-04-241-1/+7
| * | | | | git-cherry-pick: add allow-empty optionNeil Horman2012-04-111-0/+2
| |/ / / /
* | | | | Merge branch 'jk/repack-no-explode-objects-from-old-pack'Junio C Hamano2012-04-292-49/+65
|\ \ \ \ \
| * | | | | gc: use argv-array for sub-commandsJeff King2012-04-181-45/+33
| * | | | | gc: do not explode objects which will be immediately prunedJeff King2012-04-112-10/+38
| |/ / / /
* | | | | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-272-63/+207
|\ \ \ \ \
| * | | | | fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-181-9/+119
| * | | | | builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-171-25/+40
| * | | | | builtin/merge.c: collect other parents earlyJunio C Hamano2012-04-171-13/+27
| * | | | | builtin/merge.c: remove "remoteheads" global variableJunio C Hamano2012-04-171-23/+28
* | | | | | Merge branch 'cb/cherry-pick-rev-path-confusion'Junio C Hamano2012-04-271-1/+4
|\ \ \ \ \ \
| * | | | | | cherry-pick: do not expect file argumentsClemens Buchacher2012-04-151-1/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mb/fetch-call-a-non-branch-a-ref'Junio C Hamano2012-04-261-4/+13
|\ \ \ \ \ \
| * | | | | | fetch: describe new refs based on where it came fromMarc Branchaud2012-04-171-3/+11
| * | | | | | fetch: Give remote_ref to update_local_ref() as wellMarc Branchaud2012-04-171-1/+2
| | |/ / / / | |/| | | |