summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ / / | |/| | |
* | | | | Merge branch 'vl/maint-openssl-signature-change'Junio C Hamano2009-11-101-0/+4
|\ \ \ \ \
| * | | | | imap-send.c: fix compiler warnings for OpenSSL 1.0Vietor Liu2009-10-311-0/+4
* | | | | | Merge branch 'jk/maint-push-config'Junio C Hamano2009-11-101-2/+1
|\ \ \ \ \ \
| * | | | | | push: always load default configJeff King2009-10-251-2/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jk/gitignore-anchored'Junio C Hamano2009-11-101-177/+177
|\ \ \ \ \ \
| * | | | | | gitignore: root most patterns at the top-level directoryJeff King2009-10-271-177/+177
* | | | | | | Merge branch 'jp/dirty-describe'Junio C Hamano2009-11-103-1/+44
|\ \ \ \ \ \ \
| * | | | | | | Teach "git describe" --dirty optionJean Privat2009-10-273-1/+44
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sr/blame-incomplete'Junio C Hamano2009-11-101-0/+6
|\ \ \ \ \ \ \
| * | | | | | | blame: make sure that the last line ends in an LFJohannes Schindelin2009-10-211-0/+6
| |/ / / / / /
* | | | | | | git-update-index.txt: Document the --really-refresh option.Štěpán Němec2009-11-101-1/+5
* | | | | | | Merge branch 'maint'Junio C Hamano2009-11-081-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Add intermediate build products to .gitignoreJonathan Nieder2009-11-081-0/+1
* | | | | | | Merge branch 'jc/commit-s-subject-is-not-a-footer'Junio C Hamano2009-11-062-1/+10
|\ \ \ \ \ \ \
| * | | | | | | builtin-commit.c: fix logic to omit empty line before existing footersJunio C Hamano2009-11-062-1/+10
* | | | | | | | pack-objects: move thread autodetection closer to relevant codeNicolas Pitre2009-11-051-5/+2
* | | | | | | | Merge branch 'maint'Junio C Hamano2009-11-044-7/+13
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Fix documentation grammar typoGisle Aas2009-11-041-1/+1
| * | | | | | | Allow curl helper to work without a local repositoryDaniel Barkalow2009-11-031-1/+4
| * | | | | | | Require a struct remote in transport_get()Daniel Barkalow2009-11-032-5/+8
| * | | | | | | Merge branch 'bg/clone-doc' into maintJunio C Hamano2009-11-011-13/+13
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jn/show-normalized-refs'Junio C Hamano2009-11-021-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t1402: Make test executableStephen Boyd2009-11-021-0/+0
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-11-011-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Makefile: add compat/bswap.h to LIB_HDmitry V. Levin2009-11-011-0/+1
| | |_|_|_|_|/ / / | |/| | | | | | |