summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Check the format of more printf-type functionsTarmigan Casebolt2009-11-1510-3/+22
* Merge branch 'maint'Junio C Hamano2009-11-150-0/+0
|\
| * Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maintJunio C Hamano2009-11-151-2/+2
| |\
| * \ Merge branch 'tr/maint-roff-quote' into maintJunio C Hamano2009-11-153-0/+28
| |\ \
| * \ \ Merge branch 'ja/fetch-doc' into maintJunio C Hamano2009-11-153-67/+76
| |\ \ \
| * \ \ \ Merge branch 'cb/doc-fetch-pull-merge' into maintJunio C Hamano2009-11-153-45/+66
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/maint-cvsimport-pathname' into maintJunio C Hamano2009-11-151-3/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/receive-pack-auto' into maintJunio C Hamano2009-11-153-4/+36
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'gb/maint-gitweb-esc-param' into maintJunio C Hamano2009-11-151-2/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jn/gitweb-patch' into maintJunio C Hamano2009-11-151-3/+3
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'bs/maint-pre-commit-hook-sample'Junio C Hamano2009-11-151-9/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pre-commit.sample: Diff against the empty tree when HEAD is invalidBjörn Steinbrink2009-11-061-9/+9
* | | | | | | | | | | Merge branch 'js/maint-diff-color-words'Junio C Hamano2009-11-152-8/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff --color-words: bit of clean-upJunio C Hamano2009-10-311-14/+12
| * | | | | | | | | | | diff --color-words -U0: fix the location of hunk headersJohannes Schindelin2009-10-302-1/+7
| * | | | | | | | | | | t4034-diff-words: add a test for word diff without contextMarkus Heidelberg2009-10-301-0/+20
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs/pretty-wrap'Junio C Hamano2009-11-151-0/+57
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | log --format: don't ignore %w() at the start of format stringRené Scharfe2009-11-081-1/+1
| * | | | | | | | | | | Implement wrap format %w() as if it is a mode switchRené Scharfe2009-10-221-0/+57
* | | | | | | | | | | | Merge branch 'js/log-rewrap'Junio C Hamano2009-11-152-9/+53
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Teach --wrap to only indent without wrappingJunio C Hamano2009-10-221-0/+13
| * | | | | | | | | | | Add strbuf_add_wrapped_text() to utf8.[ch]Johannes Schindelin2009-10-192-9/+26
| * | | | | | | | | | | print_wrapped_text(): allow hard newlinesJohannes Schindelin2009-10-191-2/+16
* | | | | | | | | | | | Merge branch 'fc/doc-fast-forward'Junio C Hamano2009-11-1535-73/+73
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use 'fast-forward' all over the placeFelipe Contreras2009-10-2435-71/+71
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sc/difftool-p4merge'Junio C Hamano2009-11-155-6/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon2009-10-285-6/+19
* | | | | | | | | | | | | Merge branch 'jk/maint-add-p-empty'Junio C Hamano2009-11-152-5/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add-interactive: handle deletion of empty filesJeff King2009-10-272-5/+30
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'lt/revision-bisect'Junio C Hamano2009-11-154-1/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add '--bisect' revision machinery argumentLinus Torvalds2009-10-284-1/+32
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-11-151-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | git-add.txt: fix formatting of --patch sectionStephen Boyd2009-11-141-4/+4
* | | | | | | | | | | | | bash: add the merge option --ff-onlyBjörn Gustavsson2009-11-141-1/+1
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-11-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | check-ref-format -h: it does not know the --print option yetJunio C Hamano2009-11-101-1/+1
* | | | | | | | | | | | | git-describe.txt: formatting fixJunio C Hamano2009-11-101-0/+1
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-11-102-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | merge: do not setup worktree twiceJonathan Nieder2009-11-101-1/+0
| * | | | | | | | | | | | check-ref-format: update usage stringJonathan Nieder2009-11-101-1/+5
* | | | | | | | | | | | | Merge branch 'jk/maint-format-patch-p-suppress-stat'Junio C Hamano2009-11-102-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | format-patch: make "-p" suppress diffstatJeff King2009-11-082-2/+28
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'pb/maint-gitweb-blob-lineno'Junio C Hamano2009-11-101-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gitweb: Fix blob linenr links in pathinfo modePetr Baudis2009-11-061-1/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'tr/describe-advice'Junio C Hamano2009-11-101-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | describe: when failing, tell the user about options that workThomas Rast2009-10-281-4/+12
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/maint-1.6.3-ls-files-i'Junio C Hamano2009-11-103-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ls-files: unbreak "ls-files -i"Jeff King2009-10-303-2/+20
* | | | | | | | | | | | | | Merge branch 'bg/merge-ff-only'Junio C Hamano2009-11-104-3/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson2009-10-304-3/+61
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |