summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/apply-blank-at-eof-fix'Junio C Hamano2011-10-131-2/+9
* Merge branch 'nd/maint-autofix-tag-in-head'Junio C Hamano2011-10-133-59/+66
|\
| * Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy2011-09-183-8/+7
| * merge: remove global variable head[]Nguyễn Thái Ngọc Duy2011-09-181-44/+53
| * merge: use return value of resolve_ref() to determine if HEAD is invalidNguyễn Thái Ngọc Duy2011-09-181-1/+1
| * merge: keep stash[] a local variableNguyễn Thái Ngọc Duy2011-08-261-17/+16
* | Merge branch 'bw/grep-no-index-no-exclude'Junio C Hamano2011-10-131-3/+3
* | Merge branch 'jc/parse-options-boolean'Junio C Hamano2011-10-122-10/+3
|\ \
| * | apply: use OPT_NOOP_NOARGjc/parse-options-booleanRené Scharfe2011-09-281-7/+2
| * | revert: use OPT_NOOP_NOARGRené Scharfe2011-09-281-3/+1
* | | Merge branch 'rs/name-rev-usage'Junio C Hamano2011-10-121-1/+3
|\ \ \
| * | | name-rev: split usage stringrs/name-rev-usageRené Scharfe2011-10-031-1/+3
* | | | Merge branch 'mh/check-ref-format-3'Junio C Hamano2011-10-107-29/+46
|\ \ \ \
| * | | | Change check_refname_format() to reject unnormalized refnamesMichael Haggerty2011-10-051-8/+7
| * | | | Inline function refname_format_print()Michael Haggerty2011-10-051-9/+7
| * | | | Make collapse_slashes() allocate memory for its resultMichael Haggerty2011-10-051-9/+10
| * | | | Change check_ref_format() to take a flags argumentMichael Haggerty2011-10-057-27/+8
| * | | | git check-ref-format: add options --allow-onelevel and --refspec-patternMichael Haggerty2011-10-051-9/+47
* | | | | Merge branch 'mz/remote-rename'Junio C Hamano2011-10-101-7/+21
|\ \ \ \ \
| * | | | | remote: only update remote-tracking branch if updating refspecMartin von Zweigbergk2011-09-111-3/+7
| * | | | | remote rename: warn when refspec was not updatedMartin von Zweigbergk2011-09-111-0/+6
| * | | | | remote: "rename o foo" should not rename ref "origin/bar"Martin von Zweigbergk2011-09-111-1/+1
| * | | | | remote: write correct fetch spec when renaming remote 'remote'Martin von Zweigbergk2011-09-111-4/+8
* | | | | | Merge branch 'cb/common-prefix-unification'Junio C Hamano2011-10-102-3/+4
|\ \ \ \ \ \
| * | | | | | rename pathspec_prefix() to common_prefix() and move to dir.[ch]Clemens Buchacher2011-09-122-2/+2
| * | | | | | remove prefix argument from pathspec_prefixClemens Buchacher2011-09-062-3/+4
* | | | | | | Merge branch 'fg/submodule-git-file-git-dir'Junio C Hamano2011-10-101-0/+8
|\ \ \ \ \ \ \
| * | | | | | | rev-parse: add option --resolve-git-dir <path>Fredrik Gustafsson2011-08-161-0/+8
* | | | | | | | Fix some "variable might be used uninitialized" warningsRamsay Jones2011-10-091-1/+1
* | | | | | | | Merge branch 'js/check-attr-cached'Junio C Hamano2011-10-051-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Teach '--cached' option to check-attrJay Soffian2011-09-221-0/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jc/ls-remote-short-help'Junio C Hamano2011-10-051-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | ls-remote: a lone "-h" is asking for helpjc/ls-remote-short-helpJunio C Hamano2011-09-161-0/+3
* | | | | | | | | Merge branch 'jk/argv-array'Junio C Hamano2011-10-051-19/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: use argv_array APIJeff King2011-09-141-19/+8
* | | | | | | | | | Merge branch 'mg/branch-list'Junio C Hamano2011-10-052-19/+42
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch: -v does not automatically imply --listMichael J Gruber2011-09-081-2/+1
| * | | | | | | | | | branch: allow pattern argumentsMichael J Gruber2011-08-281-3/+21
| * | | | | | | | | | branch: introduce --list optionMichael J Gruber2011-08-281-3/+9
| * | | | | | | | | | git-branch: introduce missing long forms for the optionsMichael J Gruber2011-08-281-5/+5
| * | | | | | | | | | git-tag: introduce long forms for the optionsMichael J Gruber2011-08-281-8/+8
* | | | | | | | | | | Merge branch 'jk/for-each-ref'Junio C Hamano2011-10-051-25/+68
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | for-each-ref: add split message parts to %(contents:*).Michał Górny2011-09-081-6/+26
| * | | | | | | | | | | for-each-ref: handle multiline subjects like --prettyJeff King2011-09-081-5/+24
| * | | | | | | | | | | for-each-ref: refactor subject and body placeholder parsingJeff King2011-09-081-25/+29
* | | | | | | | | | | | Merge branch 'jc/run-receive-hook-cleanup'Junio C Hamano2011-10-051-19/+52
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | refactor run_receive_hook()Junio C Hamano2011-09-121-19/+52
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/receive-verify'Junio C Hamano2011-10-052-56/+57
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | receive-pack: check connectivity before concluding "git push"Junio C Hamano2011-09-091-0/+43
| * | | | | | | | | | | | check_everything_connected(): libifyJunio C Hamano2011-09-091-65/+1