summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge: backport GIT_MERGE_AUTOEDIT supportjc/maint-merge-autoeditJunio C Hamano2012-03-202-3/+40
* Git 1.7.9.4v1.7.9.4Junio C Hamano2012-03-124-3/+28
* Merge branch 'tr/maint-bundle-boundary' into maintJunio C Hamano2012-03-122-23/+36
|\
| * bundle: keep around names passed to add_pending_object()tr/maint-bundle-boundaryThomas Rast2012-03-012-1/+16
| * t5510: ensure we stay in the toplevel test dirThomas Rast2012-03-011-8/+10
| * t5510: refactor bundle->pack conversionThomas Rast2012-03-011-14/+10
* | Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano2012-03-122-86/+111
|\ \
| * | diff -p: squelch "diff --git" header for stat-dirty pathsjc/maint-diff-patch-headerJunio C Hamano2012-03-012-5/+2
| * | t4011: illustrate "diff-index -p" on stat-dirty pathsJunio C Hamano2012-03-011-7/+39
| * | t4011: modernise styleJunio C Hamano2012-03-011-86/+82
* | | Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maintJunio C Hamano2012-03-121-8/+8
|\ \ \
| * | | gitweb: Fix fixed string (non-regexp) project searchjn/maint-do-not-match-with-unsanitized-searchtextJakub Narebski2012-03-061-8/+8
* | | | Merge branch 'jc/am-3-nonstandard-popt' into maintJunio C Hamano2012-03-122-4/+22
|\ \ \ \
| * | | | test: "am -3" can accept non-standard -p<num>jc/am-3-nonstandard-poptJunio C Hamano2012-02-261-0/+15
| * | | | am -3: allow nonstandard -p<num> optionJunio C Hamano2012-02-221-4/+7
* | | | | t5704: fix nonportable sed/grep usagesThomas Rast2012-03-061-2/+2
* | | | | Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-061-0/+3
|\ \ \ \ \
| * \ \ \ \ Merge branch 'maint-1.7.7' into maint-1.7.8Junio C Hamano2012-03-061-0/+3
| |\ \ \ \ \
| | * | | | | Document the --histogram diff optionThomas Rast2012-03-061-0/+3
* | | | | | | Git 1.7.9.3v1.7.9.3Junio C Hamano2012-03-052-2/+3
* | | | | | | Merge branch 'jc/doc-merge-options' into maintJunio C Hamano2012-03-051-11/+11
|\ \ \ \ \ \ \
| * | | | | | | Documentation/merge-options.txt: group "ff" related options togetherjc/doc-merge-optionsJunio C Hamano2012-02-221-11/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'cn/maint-rev-list-doc' into maintJunio C Hamano2012-03-051-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Documentation: use {asterisk} in rev-list-options.txt when neededcn/maint-rev-list-docCarlos Martín Nieto2012-02-281-6/+6
| | |/ / / / / | |/| | | | |
* | | | | | | fast-import: zero all of 'struct tag' to silence valgrindThomas Rast2012-03-051-1/+1
* | | | | | | Update draft release notes to 1.7.9.3 for the last timeJunio C Hamano2012-03-041-0/+27
* | | | | | | Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2012-03-042-0/+8
|\ \ \ \ \ \ \
| * | | | | | | branch: don't assume the merge filter ref existscn/maint-branch-with-badCarlos Martín Nieto2012-02-272-0/+8
| |/ / / / / /
* | | | | | | Merge branch 'jn/maint-gitweb-invalid-regexp' into maintJunio C Hamano2012-03-042-1/+20
|\ \ \ \ \ \ \
| * | | | | | | gitweb: Handle invalid regexp in regexp searchjn/maint-gitweb-invalid-regexpJakub Narebski2012-02-282-1/+20
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'nd/maint-verify-objects' into maintJunio C Hamano2012-03-042-25/+18
|\ \ \ \ \ \ \
| * | | | | | | rev-list: fix --verify-objects --quiet becoming --objectsnd/maint-verify-objectsNguyễn Thái Ngọc Duy2012-02-282-13/+17
| * | | | | | | rev-list: remove BISECT_SHOW_TRIED flagNguyễn Thái Ngọc Duy2012-02-282-12/+1
* | | | | | | | Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maintJunio C Hamano2012-03-044-9/+125
|\ \ \ \ \ \ \ \
| * | | | | | | | do not stream large files to pack when filters are in usejk/maint-avoid-streaming-filtered-contentsJeff King2012-02-242-5/+95
| * | | | | | | | teach dry-run convert_to_git not to require a src bufferJeff King2012-02-241-2/+10
| * | | | | | | | teach convert_to_git a "dry run" modeJeff King2012-02-242-2/+20
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jb/filter-ignore-sigpipe' into maintJunio C Hamano2012-03-041-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Ignore SIGPIPE when running a filter driverjb/filter-ignore-sigpipeJehan Bing2012-02-211-0/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'sp/smart-http-failure-to-push' into maintJunio C Hamano2012-03-041-3/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | disconnect from remote helpers more gentlysp/smart-http-failure-to-pushJeff King2012-02-231-3/+10
* | | | | | | | | Merge branch 'tr/maint-bundle-long-subject' into maintJunio C Hamano2012-03-045-51/+67
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | t5704: match tests to modern styletr/maint-bundle-long-subjectThomas Rast2012-02-231-25/+8
| * | | | | | | | strbuf: improve strbuf_get*line documentationThomas Rast2012-02-231-1/+17
| * | | | | | | | bundle: use a strbuf to scan the log for boundary commitsThomas Rast2012-02-232-7/+24
| * | | | | | | | bundle: put strbuf_readline_fd in strbuf.c with adjustmentsThomas Rast2012-02-223-19/+19
| | |/ / / / / / | |/| | | | | |
* | | | | | | | http.proxy: also mention https_proxy and all_proxyClemens Buchacher2012-03-041-3/+4
* | | | | | | | t0300: work around bug in dash 0.5.6Michael J Gruber2012-03-021-1/+4
* | | | | | | | t5512 (ls-remote): modernize styleTom Grennan2012-03-021-23/+4
* | | | | | | | tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/shStefano Lattarini2012-03-021-4/+5
View Lorry Controller Status