summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scalerJunio C Hamano2012-02-244-29/+58
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2012-03-062-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | perf: compare diff algorithmsThomas Rast2012-03-061-0/+29
* | | | | | | | | | | | | | | Sync with 1.7.9.3Junio C Hamano2012-03-052-2/+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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cn/maint-rev-list-doc' into maintJunio C Hamano2012-03-051-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fast-import: zero all of 'struct tag' to silence valgrindThomas Rast2012-03-051-1/+1
* | | | | | | | | | | | | | | | | fsck doc: a minor typofixJunio C Hamano2012-03-051-1/+1
* | | | | | | | | | | | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-03-041-34/+11
* | | | | | | | | | | | | | | | | Merge branch 'jk/symbolic-ref-short'Junio C Hamano2012-03-042-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | symbolic-ref --short: abbreviate the output unambiguouslyjk/symbolic-ref-shortJan Krüger2012-02-272-4/+14
* | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-hilite-regions'Junio C Hamano2012-03-041-3/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | gitweb: Highlight matched part of shortened project descriptionjn/gitweb-hilite-regionsJakub Narebski2012-02-261-5/+47
| * | | | | | | | | | | | | | | | | | gitweb: Highlight matched part of project description when searching projectsJakub Narebski2012-02-261-2/+6
| * | | | | | | | | | | | | | | | | | gitweb: Highlight matched part of project name when searching projectsJakub Narebski2012-02-261-1/+3
| * | | | | | | | | | | | | | | | | | gitweb: Introduce esc_html_match_hl and esc_html_hl_regionsJakub Narebski2012-02-261-0/+41
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/am-3-nonstandard-popt'Junio C Hamano2012-03-042-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
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-03-045-31/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-gitweb-invalid-regexp' into maintJunio C Hamano2012-03-042-1/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/maint-verify-objects' into maintJunio C Hamano2012-03-042-25/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maintJunio C Hamano2012-03-044-9/+125
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jb/filter-ignore-sigpipe' into maintJunio C Hamano2012-03-041-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/smart-http-failure-to-push' into maintJunio C Hamano2012-03-041-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-bundle-long-subject' into maintJunio C Hamano2012-03-045-51/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | parse-options: typo check for unknown switchesRené Scharfe2012-03-042-0/+12
* | | | | | | | | | | | | | | | | | | | | | | gitweb: Fix passing parameters to git_project_search_formJakub Narebski2012-03-021-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-03-021-12/+21
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-03-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Documentation: do not assume that n > 1 in <rev>~$nJunio C Hamano2012-03-021-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/fsck-squelch-dangling'Junio C Hamano2012-03-015-17/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | fsck: --no-dangling omits "dangling object" informationcb/fsck-squelch-danglingJunio C Hamano2012-02-285-17/+20
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/no-no-no-parseopt'Junio C Hamano2012-03-018-32/+108
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | parse-options: remove PARSE_OPT_NEGHELPrs/no-no-no-parseoptRené Scharfe2012-02-284-13/+5
| * | | | | | | | | | | | | | | | | | | | | | | parse-options: allow positivation of options starting, with no-René Scharfe2012-02-263-12/+20
| * | | | | | | | | | | | | | | | | | | | | | | test-parse-options: convert to OPT_BOOL()René Scharfe2012-02-262-6/+66
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'th/git-diffall'Junio C Hamano2012-03-012-0/+292
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | contrib: add git-diffall scriptTim Henigan2012-02-272-0/+292