summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/glossary-revision'Junio C Hamano2013-04-261-3/+1
|\
| * glossary: a revision is just a commitJonathan Nieder2013-04-211-3/+1
* | Merge branch 'jc/add-ignore-removal'Junio C Hamano2013-04-261-4/+6
|\ \
| * | git add: --ignore-removal is a better named --no-allJunio C Hamano2013-04-221-4/+6
* | | Sync with 1.8.2.2Junio C Hamano2013-04-262-1/+20
|\ \ \
| * | | Git 1.8.2.2v1.8.2.2Junio C Hamano2013-04-262-1/+20
| * | | Merge branch 'jn/gitweb-install-doc' into maintJunio C Hamano2013-04-261-0/+7
| |\ \ \
* | \ \ \ Merge branch 'jk/remote-helper-with-signed-tags'Junio C Hamano2013-04-242-4/+10
|\ \ \ \ \
| * | | | | transport-helper: add 'signed-tags' capabilityJohn Keeping2013-04-151-0/+4
| * | | | | fast-export: add --signed-tags=warn-strip modeJohn Keeping2013-04-151-4/+6
* | | | | | Sync with maintJunio C Hamano2013-04-241-0/+18
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update draft release notes to 1.8.2.2Junio C Hamano2013-04-241-0/+18
| * | | | | Merge branch 'jk/diff-algo-finishing-touches' into maintJunio C Hamano2013-04-241-0/+6
| |\ \ \ \ \
* | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-231-0/+19
* | | | | | | Merge branch 'nd/pretty-formats'Junio C Hamano2013-04-231-7/+28
|\ \ \ \ \ \ \
| * | | | | | | pretty: support %>> that steal trailing spacesNguyễn Thái Ngọc Duy2013-04-181-1/+4
| * | | | | | | pretty: support truncating in %>, %< and %><Nguyễn Thái Ngọc Duy2013-04-181-2/+5
| * | | | | | | pretty: support padding placeholders, %< %> and %><Nguyễn Thái Ngọc Duy2013-04-181-0/+8
| * | | | | | | pretty: add %C(auto) for auto-coloringNguyễn Thái Ngọc Duy2013-04-181-1/+2
| * | | | | | | pretty-formats.txt: wrap long linesNguyễn Thái Ngọc Duy2013-04-181-6/+12
* | | | | | | | Merge branch 'kb/status-ignored-optim-2'Junio C Hamano2013-04-231-3/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | dir.c: git-status --ignored: don't scan the work tree twiceKarsten Blees2013-04-151-3/+22
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jn/gitweb-install-doc'Junio C Hamano2013-04-231-0/+7
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibilityJonathan Nieder2013-04-171-0/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Sync with maintJunio C Hamano2013-04-221-0/+25
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Start preparing for 1.8.2.2Junio C Hamano2013-04-221-0/+25
| * | | | | Merge branch 'ta/glossary' into maintJunio C Hamano2013-04-2232-111/+89
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/doc-http-backend' into maintJunio C Hamano2013-04-221-1/+81
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-221-0/+22
* | | | | | | | | Merge branch 'jc/add-2.0-delete-default' (early part)Junio C Hamano2013-04-221-1/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git add: start preparing for "git add <pathspec>..." to default to "-A"Junio C Hamano2013-03-081-1/+13
* | | | | | | | | | Merge branch 'nd/checkout-keep-sparse'Junio C Hamano2013-04-222-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | checkout: add --ignore-skip-worktree-bits in sparse checkout modeNguyễn Thái Ngọc Duy2013-04-152-0/+10
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | 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-211-1/+81
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | doc/http-backend: match query-string in apache half-auth exampleJeff King2013-04-131-8/+24
| * | | | | | | | 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
* | | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-191-1/+27
* | | | | | | | | Merge branch 'ap/strbuf-humanize'Junio C Hamano2013-04-192-4/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | count-objects: add -H option to humanize sizesAntoine Pelisse2013-04-101-4/+10
| * | | | | | | | | strbuf: create strbuf_humanise_bytes() to show byte sizesAntoine Pelisse2013-04-101-0/+5
* | | | | | | | | | Merge branch 'fc/branch-upstream-color'Junio C Hamano2013-04-191-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch: colour upstream branchesFelipe Contreras2013-04-151-1/+2
| | |_|_|/ / / / / / | |/| | | | | | | |