summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'th/bisect-skipped-log'Junio C Hamano2013-04-261-0/+20
|\
| * bisect: Log possibly bad, skipped commits at bisection endTorstein Hegge2013-04-231-0/+20
* | Merge branch 'ph/rebase-original'Junio C Hamano2013-04-261-0/+7
|\ \
| * | rebase: find orig_head unambiguouslyPhil Hord2013-04-231-0/+7
* | | Sync with 1.8.2.2Junio C Hamano2013-04-263-10/+22
|\ \ \
| * \ \ Merge branch 'jk/chopped-ident' into maintJunio C Hamano2013-04-262-4/+43
| |\ \ \
| * \ \ \ Merge branch 'rt/commentchar-fmt-merge-msg' into maintJunio C Hamano2013-04-261-0/+18
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/empty-archive' into maintJunio C Hamano2013-04-261-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'pe/pull-rebase-v-q' into maintJunio C Hamano2013-04-261-0/+27
| |\ \ \ \ \ \
| * | | | | | | t7409: do not use export X=YTorsten Bögershausen2013-04-261-4/+10
| * | | | | | | t9501: do not use export X=YTorsten Bögershausen2013-04-261-5/+10
| * | | | | | | t9020: do not use export X=YTorsten Bögershausen2013-04-261-1/+2
| * | | | | | | Merge branch 'sr/log-SG-no-textconv' into maintJunio C Hamano2013-04-241-0/+28
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/merge-tag-object' into maintJunio C Hamano2013-04-241-32/+68
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/doc-http-backend' into maintJunio C Hamano2013-04-222-0/+48
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-trash' into maintJunio C Hamano2013-04-221-9/+9
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/rerere-forget-protect-against-NUL' into maintJunio C Hamano2013-04-221-0/+25
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ws-fix-tab-in-indent' into maintJunio C Hamano2013-04-223-1/+31
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/combine-diff-ignore-whitespace' into maintJunio C Hamano2013-04-221-0/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/perl-keep-stderr-open' into maintJunio C Hamano2013-04-221-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lf/bundle-with-tip-wo-message' into maintJunio C Hamano2013-04-221-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-come-back-to-original' into maintJunio C Hamano2013-04-221-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/remote-helper-with-signed-tags'Junio C Hamano2013-04-242-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | transport-helper: add 'signed-tags' capabilityJohn Keeping2013-04-151-1/+11
| * | | | | | | | | | | | | | | | | | transport-helper: pass --signed-tags=warn-strip to fast-exportJohn Keeping2013-04-151-0/+10
| * | | | | | | | | | | | | | | | | | fast-export: add --signed-tags=warn-strip modeJohn Keeping2013-04-151-0/+6
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/pretty-formats'Junio C Hamano2013-04-233-10/+185
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | pretty: support %>> that steal trailing spacesNguyễn Thái Ngọc Duy2013-04-181-0/+14
| * | | | | | | | | | | | | | | | | | | pretty: support truncating in %>, %< and %><Nguyễn Thái Ngọc Duy2013-04-181-0/+39
| * | | | | | | | | | | | | | | | | | | pretty: support padding placeholders, %< %> and %><Nguyễn Thái Ngọc Duy2013-04-181-0/+122
| * | | | | | | | | | | | | | | | | | | pretty: two phase conversion for non utf-8 commitsNguyễn Thái Ngọc Duy2013-04-181-6/+6
| * | | | | | | | | | | | | | | | | | | pretty: share code between format_decoration and show_decorationsNguyễn Thái Ngọc Duy2013-04-181-4/+4
* | | | | | | | | | | | | | | | | | | | Merge branch 'kb/status-ignored-optim-2'Junio C Hamano2013-04-233-3/+205
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | dir.c: git-clean -d -X: don't delete tracked directoriesKarsten Blees2013-04-153-3/+63
| * | | | | | | | | | | | | | | | | | | dir.c: make 'git-status --ignored' work within leading directoriesKarsten Blees2013-04-151-0/+19
| * | | | | | | | | | | | | | | | | | | dir.c: git-status --ignored: don't list empty directories as ignoredKarsten Blees2013-04-151-2/+24
| * | | | | | | | | | | | | | | | | | | dir.c: git-ls-files --directories: don't hide empty directoriesKarsten Blees2013-04-151-0/+23
| * | | | | | | | | | | | | | | | | | | dir.c: git-status --ignored: don't list empty ignored directoriesKarsten Blees2013-04-151-0/+24
| * | | | | | | | | | | | | | | | | | | dir.c: git-status --ignored: don't list files in ignored directoriesKarsten Blees2013-04-151-0/+27
| * | | | | | | | | | | | | | | | | | | dir.c: git-status --ignored: don't drop ignored directoriesKarsten Blees2013-04-151-0/+27
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'as/clone-reference-with-gitfile'Junio C Hamano2013-04-221-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | clone: Allow repo using gitfile as a referenceAaron Schrab2013-04-091-0/+13
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/add-2.0-delete-default' (early part)Junio C Hamano2013-04-221-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | git add: start preparing for "git add <pathspec>..." to default to "-A"Junio C Hamano2013-03-081-3/+3
* | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/checkout-keep-sparse'Junio C Hamano2013-04-222-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | checkout: add --ignore-skip-worktree-bits in sparse checkout modeNguyễn Thái Ngọc Duy2013-04-152-1/+25
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/chopped-ident'Junio C Hamano2013-04-222-4/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | pretty: handle broken commit headers gracefullyRené Scharfe2013-04-171-0/+42
| * | | | | | | | | | | | | | | | | | | | cat-file: print tags raw for "cat-file -p"Jeff King2013-04-171-4/+1
| | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'th/bisect-final-log'Junio C Hamano2013-04-221-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \