summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* git-svn: avoid self-referencing mergeinfoMichael Contreras2013-05-091-1/+0
* Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-05-061-0/+51
|\
| * merge-tree: handle directory/empty conflict correctlyJohn Keeping2013-05-061-0/+51
* | Merge branch 'fc/push-with-export-reporting-result'Junio C Hamano2013-05-051-0/+14
|\ \
| * | transport-helper: improve push messagesFelipe Contreras2013-05-051-0/+14
| * | Merge branch 'tr/remote-tighten-commandline-parsing' into maintJunio C Hamano2013-05-031-0/+22
| |\ \
* | \ \ Merge branch 'tr/remote-tighten-commandline-parsing'Junio C Hamano2013-05-011-0/+22
|\ \ \ \ | | |/ / | |/| |
| * | | remote: 'show' and 'prune' can take more than one remoteThomas Rast2013-04-241-8/+3
| * | | remote: check for superfluous arguments in 'git remote add'Thomas Rast2013-04-241-1/+1
| * | | remote: add a test for extra arguments, according to docsThomas Rast2013-04-241-0/+27
* | | | Merge branch 'zk/prompt-rebase-step'Junio C Hamano2013-05-011-4/+10
|\ \ \ \
| * | | | bash-prompt.sh: show where rebase is at when stoppedZoltan Klinger2013-04-251-4/+10
| |/ / /
* | | | Merge branch 'maint'Junio C Hamano2013-04-281-38/+0
|\ \ \ \ | | |/ / | |/| |
| * | | t/Makefile: remove smoke test targetsJohn Keeping2013-04-281-38/+0
* | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-04-281-0/+13
|\ \ \ \ | | |_|/ | |/| |
| * | | merge-tree: fix typo in "both changed identically"John Keeping2013-04-281-0/+13
* | | | 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
View Lorry Controller Status