summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* builtin/notes.c: mark file-scope private symbols as staticJunio C Hamano2012-09-151-2/+5
* Merge branch 'jc/mailinfo-RE'Junio C Hamano2012-09-141-1/+3
|\
| * mailinfo: strip "RE: " prefixJunio C Hamano2012-09-091-1/+3
* | Merge branch 'nd/checkout-option-parsing-fix'Junio C Hamano2012-09-141-116/+158
|\ \
| * | checkout: reorder option handlingNguyễn Thái Ngọc Duy2012-09-111-77/+112
| * | checkout: move more parameters to struct checkout_optsNguyễn Thái Ngọc Duy2012-08-291-33/+35
| * | checkout: pass "struct checkout_opts *" as const pointerNguyễn Thái Ngọc Duy2012-08-291-16/+21
* | | Merge branch 'dj/fetch-all-tags'Junio C Hamano2012-09-141-0/+4
|\ \ \
| * | | fetch --all: pass --tags/--no-tags through to each remoteDan Johnson2012-09-071-0/+4
* | | | Merge branch 'sn/ls-remote-get-url-doc'Junio C Hamano2012-09-141-1/+1
|\ \ \ \
| * | | | ls-remote: document the '--get-url' optionStefan Naewe2012-09-071-1/+1
* | | | | Merge branch 'rj/path-cleanup'Junio C Hamano2012-09-144-5/+6
|\ \ \ \ \
| * | | | | Call mkpathdup() rather than xstrdup(mkpath(...))Ramsay Jones2012-09-043-4/+4
| * | | | | Call git_pathdup() rather than xstrdup(git_path("..."))Ramsay Jones2012-09-041-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'nd/maint-remote-remove'Junio C Hamano2012-09-121-3/+3
|\ \ \ \ \
| * | | | | remote: prefer subcommand name 'remove' to 'rm'Nguyễn Thái Ngọc Duy2012-09-061-3/+3
| |/ / / /
* | | | | Merge branch 'jk/argv-array'Junio C Hamano2012-09-111-22/+25
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | submodule: use argv_array instead of hand-building arraysJens Lehmann2012-09-021-1/+1
| * | | | fetch: use argv_array instead of hand-building arraysJeff King2012-09-021-22/+25
* | | | | Merge branch 'jc/merge-bases'Junio C Hamano2012-09-114-10/+26
|\ \ \ \ \
| * | | | | merge-base: "--is-ancestor A B"Junio C Hamano2012-08-311-0/+22
| * | | | | receive-pack: use in_merge_bases() for fast-forward checkJunio C Hamano2012-08-271-7/+1
| * | | | | in_merge_bases(): support only one "other" commitJunio C Hamano2012-08-272-3/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'nd/i18n-index-pack'Junio C Hamano2012-09-111-10/+11
|\ \ \ \ \
| * | | | | i18n: mark more index-pack strings for translationNguyễn Thái Ngọc Duy2012-08-311-10/+11
* | | | | | Merge branch 'jc/maint-ident-missing-human-name'Junio C Hamano2012-09-111-1/+16
|\ \ \ \ \ \
| * | | | | | split_ident_line(): make best effort when parsing author/committer lineJunio C Hamano2012-08-311-1/+16
* | | | | | | Merge branch 'cn/branch-set-upstream-to'Junio C Hamano2012-09-101-3/+57
|\ \ \ \ \ \ \
| * | | | | | | branch: deprecate --set-upstream and show help if we detect possible mistaken...Carlos Martín Nieto2012-08-301-0/+26
| * | | | | | | branch: add --unset-upstream optionCarlos Martín Nieto2012-08-301-3/+18
| * | | | | | | branch: introduce --set-upstream-toCarlos Martín Nieto2012-08-231-2/+15
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'mz/cherry-pick-cmdline-order'Junio C Hamano2012-09-102-2/+2
|\ \ \ \ \ \ \
| * | | | | | | cherry-pick/revert: respect order of revisions to pickMartin von Zweigbergk2012-08-301-1/+1
| * | | | | | | teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk2012-08-302-2/+2
* | | | | | | | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log'Junio C Hamano2012-09-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | log: fix --quiet synonym for -sJeff King2012-08-281-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/branch-v-alignment'Junio C Hamano2012-09-071-13/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | branch -v: align even when branch names are in UTF-8Nguyễn Thái Ngọc Duy2012-08-271-13/+15
| |/ / / / / / /
| * | | | | | | Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11Junio C Hamano2012-08-241-1/+1
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jc/apply-binary-p0'Junio C Hamano2012-09-071-25/+43
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-241-25/+43
* | | | | | | | | | Merge branch 'jc/dotdot-is-parent-directory'Junio C Hamano2012-09-071-2/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-231-2/+14
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'jk/maint-checkout-orphan-check-fix' into maintJunio C Hamano2012-08-061-1/+1
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'nd/i18n-parseopt-help'Junio C Hamano2012-09-0761-892/+892
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use imperative form in help usage to describe an actionNguyễn Thái Ngọc Duy2012-08-226-10/+10
| * | | | | | | | | | | Reduce translations by using same terminologiesNguyễn Thái Ngọc Duy2012-08-223-4/+4
| * | | | | | | | | | | i18n: write-tree: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-221-5/+5
| * | | | | | | | | | | i18n: verify-tag: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-221-2/+2
| * | | | | | | | | | | i18n: verify-pack: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-221-3/+3