summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/struct-pathspec'Junio C Hamano2011-02-277-163/+65
|\
| * grep: drop pathspec_matches() in favor of tree_entry_interesting()Nguyễn Thái Ngọc Duy2011-02-031-111/+14
| * grep: use writable strbuf from caller for grep_tree()Nguyễn Thái Ngọc Duy2011-02-031-27/+24
| * grep: use match_pathspec_depth() for cache/worktree greppingNguyễn Thái Ngọc Duy2011-02-031-1/+1
| * grep: convert to use struct pathspecNguyễn Thái Ngọc Duy2011-02-031-14/+16
| * Convert ce_path_match() to use struct pathspecNguyễn Thái Ngọc Duy2011-02-031-2/+6
| * struct rev_info: convert prune_data to struct pathspecNguyễn Thái Ngọc Duy2011-02-033-10/+6
| * Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy2011-02-033-4/+4
* | git-add: make -A description clearer vs. -uMichael J Gruber2011-02-271-1/+1
* | Merge branch 'maint'Junio C Hamano2011-02-271-1/+1
|\ \
| * | branch_merged: fix grammar in warningEric Hanchrow2011-02-271-1/+1
* | | checkout: add missing const to describe_detached_headJonathan Nieder2011-02-221-1/+1
* | | Merge branch 'maint'Junio C Hamano2011-02-157-15/+15
|\ \ \ | |/ /
| * | commit,status: describe -u likewiseMichael J Gruber2011-02-151-1/+1
| * | add: describe --patch like checkout, resetMichael J Gruber2011-02-151-1/+1
| * | commit,merge,tag: describe -m likewiseMichael J Gruber2011-02-153-5/+5
| * | clone,init: describe --template using the same wordingMichael J Gruber2011-02-152-3/+3
| * | commit,status: describe --porcelain just like pushMichael J Gruber2011-02-151-2/+2
| * | commit,tag: use same wording for -FMichael J Gruber2011-02-152-2/+2
| * | correct type of EMPTY_TREE_SHA1_BINJonathan Nieder2011-02-141-1/+1
* | | repo-config: add deprecation warningRené Scharfe2011-02-131-0/+6
* | | Merge branch 'maint'Junio C Hamano2011-02-111-1/+1
|\ \ \ | |/ /
| * | Merge branch 'jc/fsck-fixes' into maintJunio C Hamano2011-02-111-9/+22
| |\ \
| * | | clone: fixup recurse_submodules optionChris Packham2011-02-111-1/+1
* | | | Merge branch 'jc/fsck-fixes'Junio C Hamano2011-02-091-9/+22
|\ \ \ \ | | |/ / | |/| |
| * | | fsck: do not give up too early in fsck_dir()Junio C Hamano2011-01-271-6/+12
| * | | fsck: drop unused parameter from traverse_one_object()Junio C Hamano2011-01-271-3/+10
| | |/ | |/|
* | | Merge branch 'jn/cherry-pick-strategy-option'Junio C Hamano2011-02-092-9/+26
|\ \ \ | |_|/ |/| |
| * | cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder2010-12-282-9/+26
* | | diff: support --cached on unborn branchesNguyễn Thái Ngọc Duy2011-02-071-2/+5
| |/ |/|
* | remote-ext: do not segfault for blank linesJonathan Nieder2011-01-181-4/+4
* | Merge branch 'maint'Junio C Hamano2011-01-121-2/+2
|\ \
| * | commit: suggest --amend --reset-author to fix commiter identityMatthieu Moy2011-01-121-2/+2
* | | Merge branch 'nd/setup'Junio C Hamano2010-12-281-2/+11
|\ \ \ | |_|/ |/| |
| * | Remove all logic from get_git_work_tree()Nguyễn Thái Ngọc Duy2010-12-221-3/+11
| * | setup: limit get_git_work_tree()'s to explicit setup case onlyNguyễn Thái Ngọc Duy2010-12-221-0/+1
* | | Merge branch 'jk/commit-die-on-bogus-ident'Junio C Hamano2010-12-221-22/+32
|\ \ \ | | |/ | |/|
| * | commit: die before asking to edit the log messageJunio C Hamano2010-12-201-22/+32
| * | Merge branch 'mg/maint-tag-rfc1991' into maintJunio C Hamano2010-12-102-20/+6
| |\ \
| * \ \ Merge branch 'jn/cherry-pick-refresh-index' into maintJunio C Hamano2010-12-091-2/+16
| |\ \ \
| * \ \ \ Merge branch 'fc/apply-p2-get-header-name' into maintJunio C Hamano2010-12-091-14/+14
| |\ \ \ \
| * \ \ \ \ Merge branch 'np/pack-broken-boundary' into maintJunio C Hamano2010-12-091-1/+15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ak/apply-non-git-epoch' into maintJunio C Hamano2010-12-091-6/+29
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'tf/commit-list-prefix'Junio C Hamano2010-12-223-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: Add commit_list prefix in two function names.Thiago Farina2010-11-293-8/+8
* | | | | | | | | builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.Thiago Farina2010-12-191-10/+2
* | | | | | | | | builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.Thiago Farina2010-12-191-6/+1
* | | | | | | | | Merge branch 'jl/fetch-submodule-recursive'Junio C Hamano2010-12-161-14/+50
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add the 'fetch.recurseSubmodules' config settingJens Lehmann2010-11-121-5/+16
| * | | | | | | | | fetch/pull: Add the --recurse-submodules optionJens Lehmann2010-11-121-14/+39