summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.11-rc0v1.7.11-rc0Junio C Hamano2012-05-252-18/+24
* Merge branch 'sp/sh-windows-pwd'Junio C Hamano2012-05-251-20/+21
|\
| * git-sh-setup: define workaround wrappers before they are usedJunio C Hamano2012-05-161-20/+21
* | Merge branch 'mh/test-keep-prove-cache'Junio C Hamano2012-05-251-2/+4
|\ \
| * | t/Makefile: retain cache t/.prove across prove runsMichael Haggerty2012-05-201-2/+4
* | | Merge branch 'rs/dir-strbuf-read-recursive-fix'Junio C Hamano2012-05-251-16/+9
|\ \ \
| * | | dir: simplify fill_directory()René Scharfe2012-05-111-8/+1
| * | | dir: respect string length argument of read_directory_recursive()René Scharfe2012-05-111-8/+8
* | | | Merge branch 'fc/git-complete-helper-fix'Junio C Hamano2012-05-252-6/+18
|\ \ \ \
| * | | | completion: add support for backwards compatibilityFelipe Contreras2012-05-201-0/+12
| * | | | completion: rename internal helpers _git and _gitkFelipe Contreras2012-05-202-6/+6
* | | | | Merge branch 'ap/checkout-no-progress-for-non-tty'Junio C Hamano2012-05-251-2/+2
|\ \ \ \ \
| * | | | | checkout: no progress messages if !isatty(2).Avery Pennarun2012-05-241-2/+2
* | | | | | Merge branch 'jk/format-person-part-buffer-limit'Junio C Hamano2012-05-251-2/+4
|\ \ \ \ \ \
| * | | | | | pretty: avoid buffer overflow in format_person_partJeff King2012-05-221-2/+4
* | | | | | | Merge branch 'jk/pretty-commit-header-incomplete-line'Junio C Hamano2012-05-251-1/+4
|\ \ \ \ \ \ \
| * | | | | | | avoid segfault when reading header of malformed commitsJeff King2012-05-221-1/+4
* | | | | | | | Merge branch 'jk/ident-split-fix'Junio C Hamano2012-05-252-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | fix off-by-one error in split_ident_lineJeff King2012-05-222-1/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rs/xdiff-fast-hash-fix'Junio C Hamano2012-05-251-15/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | xdiff: import new 32-bit version of count_masked_bytes()René Scharfe2012-05-231-13/+5
| * | | | | | | | xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe2012-05-231-1/+7
| * | | | | | | | xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe2012-05-221-3/+5
* | | | | | | | | Merge branch 'mh/ref-api'Junio C Hamano2012-05-251-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoid sorting if references are added to ref_cache in orderMichael Haggerty2012-05-241-0/+6
* | | | | | | | | | Merge branch 'rs/maint-grep-F'Junio C Hamano2012-05-255-24/+68
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | grep: stop leaking line strings with -fRené Scharfe2012-05-211-5/+2
| * | | | | | | | | | grep: support newline separated pattern listRené Scharfe2012-05-204-3/+41
| * | | | | | | | | | grep: factor out do_append_grep_pat()René Scharfe2012-05-201-6/+9
| * | | | | | | | | | grep: factor out create_grep_pat()René Scharfe2012-05-201-11/+17
* | | | | | | | | | | Sync with 1.7.10.3Junio C Hamano2012-05-253-10/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Git 1.7.10.3v1.7.10.3Junio C Hamano2012-05-252-5/+16
| * | | | | | | | | | | Merge branch 'hv/submodule-alt-odb' into maintJunio C Hamano2012-05-254-2/+39
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bp/diff-no-index-strbuf-fix' into maintJunio C Hamano2012-05-252-2/+27
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fmt-merge-message: add empty line between tag and signature verificationLinus Torvalds2012-05-251-3/+5
| * | | | | | | | | | | | | config doc: remove confusion about relative GIT_DIR from FILES sectionJonathan Nieder2012-05-251-3/+1
* | | | | | | | | | | | | | Sync with maintJunio C Hamano2012-05-242-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Update draft release notes to 1.7.10.3Junio C Hamano2012-05-241-0/+6
| * | | | | | | | | | | | | Merge branch 'jk/maint-status-porcelain-z-b' into maintJunio C Hamano2012-05-245-89/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | osxkeychain: pull make config from top-level directoryJeff King2012-05-241-2/+5
* | | | | | | | | | | | | | Update draft release notes to 1.7.11Junio C Hamano2012-05-231-0/+13
* | | | | | | | | | | | | | Merge branch 'rs/archive-tree-in-tip-simplify'Junio C Hamano2012-05-232-14/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | archive-tar: keep const in checksum calculationRené Scharfe2012-05-181-2/+2
| * | | | | | | | | | | | | | archive: simplify refname handlingRené Scharfe2012-05-181-12/+5
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'js/rev-parse-doc-fix'Junio C Hamano2012-05-231-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rev-parse doc: --git-dir does not always show a relative pathJon Seymour2012-05-181-1/+2
* | | | | | | | | | | | | | | Merge branch 'js/rebase-i-p-test-fix'Junio C Hamano2012-05-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix t3411.3 to actually rebase somethingJohannes Sixt2012-05-181-0/+1
* | | | | | | | | | | | | | | | Merge branch 'bp/diff-no-index-strbuf-fix'Junio C Hamano2012-05-232-2/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | diff --no-index: don't leak buffers in queue_diffBobby Powers2012-05-161-2/+2