summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sd/init-template'Junio C Hamano2010-03-106-12/+67
|\
| * wrap-for-bin: do not export an empty GIT_TEMPLATE_DIRJunio C Hamano2010-03-021-2/+7
| * t/t0001-init.sh: add test for 'init with init.templatedir set'Steven Drake2010-02-252-1/+21
| * init: having keywords without value is not a global error.Steven Drake2010-02-251-2/+0
| * Add a "TEMPLATE DIRECTORY" section to git-init[1].Steven Drake2010-02-173-10/+26
| * Add `init.templatedir` configuration variable.Steven Drake2010-02-171-0/+16
* | Merge branch 'sh/am-keep-cr'Junio C Hamano2010-03-106-10/+141
|\ \
| * | git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`Stefan-W. Hahn2010-02-281-0/+96
| * | git-am: Add am.keepcr and --no-keep-cr to override itStefan-W. Hahn2010-02-283-7/+26
| * | git-am: Add command line parameter `--keep-cr` passing it to git-mailsplitStefan-W. Hahn2010-02-282-8/+21
| * | documentation: 'git-mailsplit --keep-cr' is not hidden anymoreStefan-W. Hahn2010-02-282-2/+5
* | | Merge branch 'cp/add-u-pathspec'Junio C Hamano2010-03-103-9/+39
|\ \ \
| * | | test for add with non-existent pathspecChris Packham2010-02-162-0/+10
| * | | git add -u: die on unmatched pathspecJunio C Hamano2010-02-161-9/+29
* | | | Makefile: update check-docs targetJunio C Hamano2010-03-101-1/+2
* | | | Merge branch 'lt/deepen-builtin-source'Junio C Hamano2010-03-1090-107/+107
|\ \ \ \
| * | | | Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-2290-97/+97
* | | | | Update draft release notes to 1.7.1Junio C Hamano2010-03-081-3/+21
* | | | | Merge branch 'maint'Junio C Hamano2010-03-081-0/+34
|\ \ \ \ \
| * | | | | Merge accumulated fixes to prepare for 1.7.0.3Junio C Hamano2010-03-082-1/+35
| * | | | | Merge branch 'mw/maint-gcc-warns-unused-write' into maintJunio C Hamano2010-03-081-4/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fn/maint-mkdtemp-compat' into maintJunio C Hamano2010-03-081-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'gb/maint-submodule-env' into maintJunio C Hamano2010-03-088-33/+69
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'as/maint-expire' into maintJunio C Hamano2010-03-084-18/+86
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ml/maint-grep-doc' into maintJunio C Hamano2010-03-081-13/+17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-push-tracking-wo-remote' into maintJunio C Hamano2010-03-081-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fetch-param' into maintJunio C Hamano2010-03-082-33/+88
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ne/pack-local-doc' into maintJunio C Hamano2010-03-081-8/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-add--interactive-delete' into maintJunio C Hamano2010-03-082-1/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/mkstemps-mode-for-packfiles' into maintJunio C Hamano2010-03-088-93/+172
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-fix-mailinfo-strip' into maintJunio C Hamano2010-03-082-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/grep-author-all-match-implicit' into maintJunio C Hamano2010-03-086-10/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-detached' into maintJunio C Hamano2010-03-085-12/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-03-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6Junio C Hamano2010-03-072-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-push-sideband' into maint-1.6.6Junio C Hamano2010-03-0710-133/+371
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hm/maint-imap-send-crlf' into maint-1.6.6Junio C Hamano2010-03-071-1/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6Junio C Hamano2010-03-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6Junio C Hamano2010-03-072-1/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/optim-text-wrap' into maint-1.6.6Junio C Hamano2010-03-073-37/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6Junio C Hamano2010-03-071-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/maint-bisect-paths' into maint-1.6.6Junio C Hamano2010-03-072-0/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mw/maint-gcc-warns-unused-write'Junio C Hamano2010-03-071-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | run-command.c: fix build warnings on UbuntuMichael Wookey2010-03-031-4/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'as/maint-expire'Junio C Hamano2010-03-074-18/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | reflog: honor gc.reflogexpire=neverAdam Simpkins2010-02-282-4/+43
| * | | | | | | | | | | | | | | | | | | | | | | | | | prune: honor --expire=neverAdam Simpkins2010-02-282-14/+43
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ml/maint-grep-doc'Junio C Hamano2010-03-071-13/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | grep docs: document --no-index optionMark Lodato2010-02-251-4/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | grep docs: --cached and <tree>... are incompatibleMark Lodato2010-02-251-3/+3
View Lorry Controller Status