summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* stash: Don't fail if work dir contains file named 'HEAD'jm/stash-diff-disambiguateJonathon Mah2012-01-014-31/+80
* Update draft release notes to 1.7.9Junio C Hamano2011-12-281-72/+4
* Sync with 1.7.8.2Junio C Hamano2011-12-282-1/+72
|\
| * Git 1.7.8.2v1.7.8.2Junio C Hamano2011-12-283-2/+73
| * Merge branch 'jv/maint-config-set' into maintJunio C Hamano2011-12-281-1/+1
| |\
| | * Fix an incorrect reference to --set-all.jv/maint-config-setJelmer Vernooij2011-12-271-1/+1
| * | Merge branch 'jk/follow-rename-score' into maintJunio C Hamano2011-12-281-0/+1
| |\ \
| * \ \ Merge branch 'jc/checkout-m-twoway' into maintJunio C Hamano2011-12-282-24/+85
| |\ \ \
| * \ \ \ Merge branch 'tr/doc-sh-setup' into maintJunio C Hamano2011-12-281-0/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/maint-strbuf-missing-init' into maintJunio C Hamano2011-12-282-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/maint-push-v-is-verbose' into maintJunio C Hamano2011-12-281-5/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/http-push-to-empty' into maintJunio C Hamano2011-12-282-3/+36
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/doc-fsck' into maintJunio C Hamano2011-12-281-18/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maintJunio C Hamano2011-12-281-10/+50
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ef/setenv-putenv' into maintJunio C Hamano2011-12-281-2/+8
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/advice-doc' into maintJunio C Hamano2011-12-281-11/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-sequencer-fixes' into maintJunio C Hamano2011-12-286-126/+252
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-snprintf-va-copy' into maintJunio C Hamano2011-12-281-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-push-over-dav' into maintJunio C Hamano2011-12-287-5/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-mv' into maintJunio C Hamano2011-12-282-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fetch-no-tail-match-refs' into maintJunio C Hamano2011-12-288-41/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/keepalive' into maintJunio C Hamano2011-12-281-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ci/stripspace-docs' into maintJunio C Hamano2011-12-282-7/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/fast-import-notes' into maintJunio C Hamano2011-12-282-8/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintJunio C Hamano2011-12-281-13/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tj/maint-imap-send-remove-unused' into maintJunio C Hamano2011-12-281-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano2011-12-286-13/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'na/strtoimax' into maintJunio C Hamano2011-12-284-13/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/refresh-porcelain-output' into maintJunio C Hamano2011-12-281-10/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes in preparation for 1.7.9-rc0Junio C Hamano2011-12-221-1/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/bash-read-unescaped'Junio C Hamano2011-12-221-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | bash completion: use read -r everywheretr/bash-read-unescapedThomas Rast2011-12-211-6/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/sun-studio-portability'Junio C Hamano2011-12-228-22/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Appease Sun Studio by renaming "tmpfile"ab/sun-studio-portabilityÆvar Arnfjörð Bjarmason2011-12-214-16/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bitwise negation assignment issue spotted by Sun StudioÆvar Arnfjörð Bjarmason2011-12-213-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an enum assignment issue spotted by Sun StudioÆvar Arnfjörð Bjarmason2011-12-211-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/doc-sh-setup'Junio C Hamano2011-12-221-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | git-sh-setup: make require_clean_work_tree part of the interfacetr/doc-sh-setupThomas Rast2011-12-201-0/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/revert-cherry-pick'Junio C Hamano2011-12-223-49/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t3502, t3510: clarify cherry-pick -m failurerr/revert-cherry-pickRamkumar Ramachandra2011-12-152-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t3510 (cherry-pick-sequencer): use exit statusRamkumar Ramachandra2011-12-151-29/+29
| * | | | | | | | | | | | | | | | | | | | | | | | | | | revert: simplify getting commit subject in format_todo()Ramkumar Ramachandra2011-12-151-5/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | revert: tolerate extra spaces, tabs in insn sheetRamkumar Ramachandra2011-12-152-6/+23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | revert: make commit subjects in insn sheet optionalRamkumar Ramachandra2011-12-152-21/+44
| * | | | | | | | | | | | | | | | | | | | | | | | | | | revert: free msg in format_todo()Ramkumar Ramachandra2011-12-151-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/pty-all'Junio C Hamano2011-12-221-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test-terminal: set output terminals to raw modetr/pty-allThomas Rast2011-12-191-0/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/maint-gitweb-utf8-fix'Junio C Hamano2011-12-221-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Fix fallback mode of to_utf8 subroutinejn/maint-gitweb-utf8-fixJakub Narebski2011-12-191-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Output valid utf8 in git_blame_common('data')Jürgen Kreileder2011-12-181-1/+3