summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git add <pathspec>... defaults to "-A"jc/add-2.0-ignore-removalJunio C Hamano2013-04-222-46/+15
* git add: rephrase -A/--no-all warningJunio C Hamano2013-04-221-6/+6
* git add: --ignore-removal is a better named --no-allJunio C Hamano2013-04-222-4/+17
* Sync with maintJunio C Hamano2013-04-221-0/+25
|\
| * Start preparing for 1.8.2.2Junio C Hamano2013-04-222-1/+26
| * Merge branch 'ta/glossary' into maintJunio C Hamano2013-04-2232-111/+89
| |\
| * \ Merge branch 'jk/doc-http-backend' into maintJunio C Hamano2013-04-223-1/+129
| |\ \
| * \ \ Merge branch 'jk/test-trash' into maintJunio C Hamano2013-04-221-9/+9
| |\ \ \
| * \ \ \ Merge branch 'jk/daemon-user-doc' into maintJunio C Hamano2013-04-221-0/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/detached-head-doc' into maintJunio C Hamano2013-04-221-3/+16
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/show-branch-strbuf' into maintJunio C Hamano2013-04-221-9/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/rerere-forget-protect-against-NUL' into maintJunio C Hamano2013-04-222-10/+36
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/apply-ws-fix-tab-in-indent' into maintJunio C Hamano2013-04-224-7/+41
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ap/combine-diff-ignore-whitespace' into maintJunio C Hamano2013-04-222-7/+161
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/suppress-clang-warning' into maintJunio C Hamano2013-04-222-2/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/perl-keep-stderr-open' into maintJunio C Hamano2013-04-222-4/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lf/bundle-with-tip-wo-message' into maintJunio C Hamano2013-04-222-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-come-back-to-original' into maintJunio C Hamano2013-04-222-2/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/prompt-revert-head' into maintJunio C Hamano2013-04-221-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-221-0/+22
* | | | | | | | | | | | | | | | Merge branch 'as/clone-reference-with-gitfile'Junio C Hamano2013-04-222-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | clone: Allow repo using gitfile as a referenceAaron Schrab2013-04-092-2/+25
| * | | | | | | | | | | | | | | | clone: Fix error message for reference repositoryAaron Schrab2013-04-081-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'jc/add-2.0-delete-default' (early part)Junio C Hamano2013-04-223-32/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | git add: rephrase the "removal will cease to be ignored" warningJunio C Hamano2013-04-211-7/+14
| * | | | | | | | | | | | | | | | | git add: rework the logic to warn "git add <pathspec>..." default changeJunio C Hamano2013-04-171-26/+38
| * | | | | | | | | | | | | | | | | git add: start preparing for "git add <pathspec>..." to default to "-A"Junio C Hamano2013-03-083-6/+59
| * | | | | | | | | | | | | | | | | builtin/add.c: simplify boolean variablesJunio C Hamano2013-03-081-11/+11
* | | | | | | | | | | | | | | | | | Merge branch 'nd/checkout-keep-sparse'Junio C Hamano2013-04-225-1/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | checkout: add --ignore-skip-worktree-bits in sparse checkout modeNguyễn Thái Ngọc Duy2013-04-155-1/+40
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/chopped-ident'Junio C Hamano2013-04-225-99/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | blame: handle broken commit headers gracefullyRené Scharfe2013-04-171-3/+8
| * | | | | | | | | | | | | | | | | | | pretty: handle broken commit headers gracefullyRené Scharfe2013-04-172-21/+66
| * | | | | | | | | | | | | | | | | | | cat-file: print tags raw for "cat-file -p"Jeff King2013-04-172-75/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'th/bisect-final-log'Junio C Hamano2013-04-222-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | bisect: Store first bad commit as comment in log fileTorstein Hegge2013-04-152-1/+25
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs/archive-zip-raw-compression'Junio C Hamano2013-04-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | zlib: fix compilation failures with Sun C CompilaerStefano Lattarini2013-04-221-2/+2
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ta/glossary'Junio C Hamano2013-04-2132-111/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | glossary: improve definitions of refspec and pathspecThomas Ackermann2013-04-151-23/+10
| * | | | | | | | | | | | | | | | | | | | The name of the hash function is "SHA-1", not "SHA1"Thomas Ackermann2013-04-1531-68/+68
| * | | | | | | | | | | | | | | | | | | | glossary: improve description of SHA-1 related topicsThomas Ackermann2013-04-151-10/+10
| * | | | | | | | | | | | | | | | | | | | glossary: remove outdated/misleading/irrelevant entriesThomas Ackermann2013-04-151-10/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/doc-http-backend'Junio C Hamano2013-04-213-1/+129
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | doc/http-backend: match query-string in apache half-auth exampleJeff King2013-04-133-8/+72
| * | | | | | | | | | | | | | | | | | | | doc/http-backend: give some lighttpd config examplesJeff King2013-04-111-0/+55
| * | | | | | | | | | | | | | | | | | | | doc/http-backend: clarify "half-auth" repo configurationJeff King2013-04-111-0/+9
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jx/i18n-branch-error-messages'Junio C Hamano2013-04-211-27/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | i18n: branch: mark strings for translationJiang Xin2013-04-151-27/+27
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'fc/remote-hg'Junio C Hamano2013-04-214-29/+148
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \