summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jh/push-default-upstream-configname' into maintJunio C Hamano2011-03-161-5/+5
|\
| * push.default: Rename 'tracking' to 'upstream'Johan Herland2011-02-161-5/+5
* | Merge branch 'mg/placeholders-are-lowercase' into maintJunio C Hamano2011-03-168-25/+25
|\ \
| * | Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber2011-02-158-25/+25
* | | Merge branch 'mg/patch-id' into maintJunio C Hamano2011-03-161-0/+2
|\ \ \
| * | | git-patch-id: do not trip over "no newline" markersMichael J Gruber2011-02-171-0/+2
| | |/ | |/|
* | | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maintJunio C Hamano2011-03-161-8/+29
|\ \ \
| * | | merge: honor prepare-commit-msg hookJay Soffian2011-02-151-8/+29
| |/ /
* | | cherry: split off function to print output linesJonathan Nieder2011-03-161-16/+18
* | | branch: split off function that writes tracking info and commit subjectJonathan Nieder2011-03-161-21/+27
* | | standardize brace placement in struct definitionsJonathan Nieder2011-03-164-10/+5
* | | init: remove unnecessary checkNguyễn Thái Ngọc Duy2011-03-031-7/+5
* | | branch_merged: fix grammar in warningEric Hanchrow2011-02-271-1/+1
| |/ |/|
* | 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
* | Merge branch 'jc/fsck-fixes' into maintJunio C Hamano2011-02-111-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
| |/
* | clone: fixup recurse_submodules optionChris Packham2011-02-111-1/+1
* | 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
* | | | | | | | | | Merge branch 'aa/status-hilite-branch'Junio C Hamano2010-12-161-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | status: show branchname with a configurable colorAleksi Aalto2010-11-291-0/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ak/describe-exact'Junio C Hamano2010-12-161-25/+60
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | describe: Delay looking up commits until searching for an inexact matchAnders Kaseorg2010-12-091-15/+22
| * | | | | | | | | | describe: Store commit_names in a hash table by commit SHA1Anders Kaseorg2010-12-091-5/+33