summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Name make_*_path functions more accuratelyCarlos Martín Nieto2011-03-1714-38/+52
* RelNotes/1.7.5.txt: typo and language fixesMichael J Gruber2011-03-161-22/+9
* Merge branch 'maint'Junio C Hamano2011-03-1627-178/+215
|\
| * Prepare draft release notes to 1.7.4.2Junio C Hamano2011-03-162-1/+43
| * Merge branch 'jn/maint-commit-missing-template' into maintJunio C Hamano2011-03-162-4/+12
| |\
| * \ Merge branch 'lt/rename-no-extra-copy-detection' into maintJunio C Hamano2011-03-169-45/+46
| |\ \
| * \ \ Merge branch 'jk/diffstat-binary' into maintJunio C Hamano2011-03-162-10/+28
| |\ \ \
| * \ \ \ Merge branch 'mg/maint-difftool-vim-readonly' into maintJunio C Hamano2011-03-161-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'jn/test-terminal-punt-on-osx-breakage' into maintJunio C Hamano2011-03-161-3/+19
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/fail-null-clone' into maintJunio C Hamano2011-03-162-1/+14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jh/push-default-upstream-configname' into maintJunio C Hamano2011-03-164-9/+12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mg/placeholders-are-lowercase' into maintJunio C Hamano2011-03-1615-42/+42
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mg/patch-id' into maintJunio C Hamano2011-03-162-0/+38
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maintJunio C Hamano2011-03-162-8/+41
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitweb: highlight: replace tabs with spacesKevin Cernekee2011-03-161-1/+1
| * | | | | | | | | | | make_absolute_path: return the input path if it points to our bufferCarlos Martín Nieto2011-03-161-0/+4
| * | | | | | | | | | | valgrind: ignore SSE-based strlen invalid readsCarlos Martín Nieto2011-03-161-0/+6
| * | | | | | | | | | | diff --submodule: split into bite-sized piecesJonathan Nieder2011-03-161-42/+61
| * | | | | | | | | | | cherry: split off function to print output linesJonathan Nieder2011-03-161-16/+18
| * | | | | | | | | | | branch: split off function that writes tracking info and commit subjectJonathan Nieder2011-03-161-21/+27
| * | | | | | | | | | | standardize brace placement in struct definitionsJonathan Nieder2011-03-1617-88/+44
| * | | | | | | | | | | compat: make gcc bswap an inline functionJonathan Nieder2011-03-161-8/+10
| * | | | | | | | | | | enums: omit trailing comma for portabilityJonathan Nieder2011-03-162-2/+2
* | | | | | | | | | | | vcs-svn: remove spurious semicolonsJonathan Nieder2011-03-162-2/+2
* | | | | | | | | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-03-161-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | declare 1-bit bitfields to be unsignedJonathan Nieder2011-03-151-3/+3
* | | | | | | | | | | | | Update draft release notes to 1.7.5Junio C Hamano2011-03-151-3/+33
* | | | | | | | | | | | | Merge branch 'jk/strbuf-vaddf'Junio C Hamano2011-03-157-64/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | compat: fall back on __va_copy if availableJonathan Nieder2011-03-081-1/+10
| * | | | | | | | | | | | | strbuf: add strbuf_vaddfJeff King2011-02-265-63/+25
| * | | | | | | | | | | | | compat: provide a fallback va_copy definitionJeff King2011-02-262-1/+4
* | | | | | | | | | | | | | Merge branch 'mm/push-default-advice'Junio C Hamano2011-03-151-7/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | push: better error message when no remote configuredMatthieu Moy2011-03-021-1/+8
| * | | | | | | | | | | | | | push: better error messages when push.default = trackingMatthieu Moy2011-03-021-6/+16
* | | | | | | | | | | | | | | Merge branch 'jn/maint-instaweb-plack-fix'Junio C Hamano2011-03-151-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-instaweb: Change how gitweb.psgi is made runnable as standalone appJakub Narebski2011-02-271-2/+4
* | | | | | | | | | | | | | | | Merge branch 'sp/maint-fd-limit'Junio C Hamano2011-03-154-19/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | sha1_file.c: Don't retain open fds on small packsShawn O. Pearce2011-03-023-6/+39
| * | | | | | | | | | | | | | | | mingw: add minimum getrlimit() compatibility stubErik Faye-Lund2011-03-021-0/+16
| * | | | | | | | | | | | | | | | Limit file descriptors used by packsShawn O. Pearce2011-02-281-13/+30
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jc/checkout-orphan-warning'Junio C Hamano2011-03-151-6/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | commit: give final warning when reattaching HEAD to leave commits behindJunio C Hamano2011-02-231-6/+95
* | | | | | | | | | | | | | | | | Merge branch 'jh/maint-do-not-track-non-branches'Junio C Hamano2011-03-154-18/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | branch/checkout --track: Ensure that upstream branch is indeed a branchJohan Herland2011-02-164-18/+39
* | | | | | | | | | | | | | | | | | Merge branch 'fk/maint-cvsimport-early-failure'Junio C Hamano2011-03-151-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git-cvsimport.perl: Bail out right away when reading from the server failsFabian Keil2011-02-271-1/+3
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-apply-report-offset'Junio C Hamano2011-03-151-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | apply -v: show offset count when patch did not apply exactlyJunio C Hamano2011-03-061-2/+14
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-apply-no-double-patch'Junio C Hamano2011-03-151-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | apply: do not patch lines that were already patchedJunio C Hamano2011-03-041-1/+6
| |/ / / / / / / / / / / / / / / / / /