summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jh/clean-exclude'Junio C Hamano2010-08-181-1/+16
|\
| * Add -e/--exclude to git-clean.Jared Hance2010-07-201-1/+16
* | Merge branch 'jn/rebase-rename-am'Junio C Hamano2010-08-181-2/+1
|\ \
| * | Teach "apply --index-info" to handle rename patchesJunio C Hamano2010-07-231-2/+1
| |/
* | Merge branch 'ar/string-list-foreach'Junio C Hamano2010-08-182-52/+35
|\ \
| * | Convert the users of for_each_string_list to for_each_string_list_item macroAlex Riesen2010-07-052-52/+35
* | | Merge branch 'tc/checkout-B'Junio C Hamano2010-08-181-6/+26
|\ \ \
| * | | builtin/checkout: learn -BTay Ray Chuan2010-06-251-5/+24
| * | | builtin/checkout: reword hint for -bTay Ray Chuan2010-06-251-1/+2
* | | | Merge branch 'maint'Junio C Hamano2010-08-122-2/+4
|\ \ \ \
| * | | | push: mention "git pull" in error message for non-fast forwardsMatthieu Moy2010-08-121-2/+2
| * | | | index-pack: Don't follow replace refs.Nelson Elhage2010-08-121-0/+2
* | | | | Merge branch 'maint'Junio C Hamano2010-08-093-22/+32
|\ \ \ \ \ | |/ / / /
| * | | | prune: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-091-3/+2
| * | | | notes: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-091-2/+3
| * | | | Allow "check-ref-format --branch" from subdirectoryJonathan Nieder2010-08-061-0/+2
| * | | | check-ref-format: handle subcommands in separate functionsJonathan Nieder2010-08-061-17/+25
* | | | | ls-files: learn a debugging dump formatThomas Rast2010-08-021-0/+9
* | | | | builtin/push.c: remove useless temporary variableJared Hance2010-08-021-4/+4
|/ / / /
* | | | commit: remove full stop from usage help for -uStephen Boyd2010-07-271-1/+1
* | | | Clarify help message when no remote is specified in fetch/pull.Matthieu Moy2010-07-271-1/+2
* | | | Cast execl*() NULL sentinels to (char *)Thomas Rast2010-07-251-6/+6
| |_|/ |/| |
* | | Merge branch 'jl/add-n-ignore-missing'Junio C Hamano2010-07-191-4/+12
|\ \ \
| * | | git add: Add the "--ignore-missing" option for the dry runJens Lehmann2010-07-121-4/+12
* | | | Merge branch 'jc/diff-merge-base-multi'Junio C Hamano2010-07-161-13/+0
* | | | Merge branch 'wp/merge-tree-fix'Junio C Hamano2010-07-151-1/+2
|\ \ \ \
| * | | | merge-tree: fix where two branches share no changesWill Palmer2010-07-141-1/+2
* | | | | Merge branch 'js/merge-rr-fix'Junio C Hamano2010-07-151-1/+1
|\ \ \ \ \
| * | | | | MERGE_RR is in .git, not .git/rr-cacheJay Soffian2010-07-141-1/+1
| |/ / / /
* | | | | Merge branch 'jc/diff-merge-base-multi'Junio C Hamano2010-07-151-8/+23
* | | | | Merge branch 'jn/grep-open'Junio C Hamano2010-07-151-0/+1
|\ \ \ \ \
| * | | | | grep -O: Do not pass color sequences as filenames to pagerNazri Ramliy2010-07-071-0/+1
* | | | | | Merge branch 'jk/maint-status-keep-index-timestamp'Junio C Hamano2010-07-151-5/+11
|\ \ \ \ \ \
| * | | | | | do not write out index when status does not have toJunio C Hamano2010-07-061-5/+11
* | | | | | | Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fixJunio C Hamano2010-07-081-5/+0
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'maint'Junio C Hamano2010-07-071-2/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | Merge branch 'maint-1.6.4' into maintJunio C Hamano2010-07-071-2/+2
| * | | | Merge branch 'tr/receive-pack-aliased-update-fix' into maintJunio C Hamano2010-07-071-37/+91
| |/ / /
* | | | Merge branch 'ar/decorate-color'Junio C Hamano2010-06-301-0/+3
|\ \ \ \
| * | | | Allow customizable commit decorations colorsNazri Ramliy2010-06-241-0/+3
* | | | | Merge branch 'cc/cherry-pick-stdin'Junio C Hamano2010-06-301-17/+18
|\ \ \ \ \
| * | | | | revert: do not rebuild argv on heapJonathan Nieder2010-06-291-16/+16
| * | | | | revert: accept arbitrary rev-list optionsChristian Couder2010-06-251-1/+2
* | | | | | Merge branch 'jl/status-ignore-submodules'Junio C Hamano2010-06-301-1/+6
|\ \ \ \ \ \
| * | | | | | Add the option "--ignore-submodules" to "git status"Jens Lehmann2010-06-251-1/+6
* | | | | | | Merge branch 'jn/grep-open'Junio C Hamano2010-06-301-26/+95
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'jp/string-list-api-cleanup' into jn/grep-openJulian Phillips2010-06-2715-82/+82
| |\ \ \ \ \ \
| * | | | | | | grep -O: allow optional argument specifying the pager (or editor)Johannes Schindelin2010-06-131-14/+12
| * | | | | | | grep: Add the option '--open-files-in-pager'Johannes Schindelin2010-06-131-0/+73
| * | | | | | | Unify code paths of threaded grepsJohannes Schindelin2010-06-131-17/+5