summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | grep docs: use AsciiDoc literals consistentlyMark Lodato2010-02-251-5/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | grep docs: pluralize "Example" sectionMark Lodato2010-02-251-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fn/maint-mkdtemp-compat'Junio C Hamano2010-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitmkdtemp: correct test for mktemp() return valueFilippo Negroni2010-02-251-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gb/maint-submodule-env'Junio C Hamano2010-03-078-33/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | is_submodule_modified(): clear environment properlyGiuseppe Bilotta2010-02-241-11/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | submodules: ensure clean environment when operating in a submoduleGiuseppe Bilotta2010-02-241-10/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | shell setup: clear_local_git_env() functionGiuseppe Bilotta2010-02-241-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | rev-parse: --local-env-vars optionGiuseppe Bilotta2010-02-242-0/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor list of of repo-local env varsGiuseppe Bilotta2010-02-243-12/+28
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ne/pack-local-doc'Junio C Hamano2010-03-071-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects documentation: Fix --honor-pack-keep as well.Nelson Elhage2010-02-241-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects documentation: reword "objects that appear in the standard input"Junio C Hamano2010-02-241-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: pack-objects: Clarify --local's semantics.Nelson Elhage2010-02-201-5/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mb/shortlog-nongit-stdin'Junio C Hamano2010-03-071-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | shortlog: warn the user when there is no inputMichele Ballabio2010-02-241-0/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-push-tracking-wo-remote'Junio C Hamano2010-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | push: fix segfault for odd configJeff King2010-02-241-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fetch-param'Junio C Hamano2010-03-072-33/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |