summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-03-07Git 1.7.10-rc0v1.7.10-rc0Junio C Hamano2-6/+58
2012-03-07Merge branch 'jc/pickaxe-ignore-case'Junio C Hamano7-10/+170
2012-03-06Merge branch 'jh/threadable-symlink-check'Junio C Hamano2-2/+28
2012-03-06Merge branch 'jc/maint-diff-patch-header'Junio C Hamano2-86/+111
2012-03-06Merge branch 'th/mergetools-deltawalker'Junio C Hamano1-0/+21
2012-03-06Merge branch 'cn/pull-rebase-message'Junio C Hamano4-29/+24
2012-03-06Merge branch 'sl/modern-t0000'Junio C Hamano1-274/+289
2012-03-06Merge branch 'nl/http-proxy-auth'Junio C Hamano1-1/+3
2012-03-06Merge branch 'tr/maint-bundle-boundary'Junio C Hamano2-23/+36
2012-03-06Merge branch 'zj/diff-stat-dyncol'Junio C Hamano9-33/+335
2012-03-06Merge branch 'maint'Junio C Hamano2-2/+5
2012-03-06t5704: fix nonportable sed/grep usagesThomas Rast1-2/+2
2012-03-06Merge branch 'maint-1.7.8' into maintJunio C Hamano1-0/+3
2012-03-06Merge branch 'maint-1.7.7' into maint-1.7.8Junio C Hamano1-0/+3
2012-03-06Document the --histogram diff optionThomas Rast1-0/+3
2012-03-06perf: compare diff algorithmsThomas Rast1-0/+29
2012-03-05Sync with 1.7.9.3Junio C Hamano2-2/+3
2012-03-05Git 1.7.9.3v1.7.9.3Junio C Hamano2-2/+3
2012-03-05Merge branch 'jc/doc-merge-options' into maintJunio C Hamano1-11/+11
2012-03-05Merge branch 'cn/maint-rev-list-doc' into maintJunio C Hamano1-6/+6
2012-03-05fsck doc: a minor typofixJunio C Hamano1-1/+1
2012-03-05fast-import: zero all of 'struct tag' to silence valgrindThomas Rast1-1/+1
2012-03-05mergetools: add a plug-in to support DeltaWalkerTim Henigan1-0/+21
2012-03-04Update draft release notes to 1.7.10Junio C Hamano1-34/+11
2012-03-04Merge branch 'jk/symbolic-ref-short'Junio C Hamano2-4/+14
2012-03-04Merge branch 'jn/gitweb-hilite-regions'Junio C Hamano1-3/+92
2012-03-04Merge branch 'jc/am-3-nonstandard-popt'Junio C Hamano2-4/+22
2012-03-04Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto4-29/+24
2012-03-04Merge branch 'maint'Junio C Hamano5-31/+44
2012-03-04Update draft release notes to 1.7.9.3 for the last timeJunio C Hamano1-0/+27
2012-03-04Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2-0/+8
2012-03-04Merge branch 'jn/maint-gitweb-invalid-regexp' into maintJunio C Hamano2-1/+20
2012-03-04Merge branch 'nd/maint-verify-objects' into maintJunio C Hamano2-25/+18
2012-03-04Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maintJunio C Hamano4-9/+125
2012-03-04Merge branch 'jb/filter-ignore-sigpipe' into maintJunio C Hamano1-0/+5
2012-03-04Merge branch 'sp/smart-http-failure-to-push' into maintJunio C Hamano1-3/+10
2012-03-04Merge branch 'tr/maint-bundle-long-subject' into maintJunio C Hamano5-51/+67
2012-03-04ctype.c: Fix a sparse warningRamsay Jones2-3/+3
2012-03-04http.proxy: also mention https_proxy and all_proxyClemens Buchacher1-3/+4
2012-03-04parse-options: typo check for unknown switchesRené Scharfe2-0/+12
2012-03-02Add threaded versions of functions in symlinks.c.Jared Hance2-2/+28
2012-03-02t0300: work around bug in dash 0.5.6Michael J Gruber1-1/+4
2012-03-02t5512 (ls-remote): modernize styleTom Grennan1-23/+4
2012-03-02gitweb: Fix passing parameters to git_project_search_formJakub Narebski1-1/+1
2012-03-02t0000: modernise styleStefano Lattarini1-274/+289
2012-03-02tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/shStefano Lattarini1-4/+5
2012-03-02http: support proxies that require authenticationNelson Benitez Leon1-1/+3
2012-03-02Update draft release notes to 1.7.10Junio C Hamano1-12/+21
2012-03-02Merge branch 'maint'Junio C Hamano1-1/+1
2012-03-02Documentation: do not assume that n > 1 in <rev>~$nJunio C Hamano1-1/+1
2012-03-01Merge branch 'cb/fsck-squelch-dangling'Junio C Hamano5-17/+20
2012-03-01Merge branch 'rs/no-no-no-parseopt'Junio C Hamano8-32/+108
2012-03-01Merge branch 'th/git-diffall'Junio C Hamano2-0/+292
2012-03-01Merge the initial l10n effort inJunio C Hamano6-24/+7265
2012-03-01Merge branch 'master' of https://github.com/git-l10n/git-po into l10nJunio C Hamano1-4/+4
2012-03-01Update l10n guide: change the repository URL, etcJiang Xin2-10/+16
2012-03-01Merge branch 'maint'Junio C Hamano2-7/+12
2012-03-01Merge branch 'nd/maint-verify-objects'Junio C Hamano2-25/+18
2012-03-01Merge branch 'jn/maint-gitweb-invalid-regexp'Junio C Hamano2-1/+20
2012-03-01Merge branch 'cn/maint-rev-list-doc'Junio C Hamano1-6/+6
2012-03-01Merge branch 'cn/maint-branch-with-bad'Junio C Hamano2-0/+8
2012-03-01bundle: keep around names passed to add_pending_object()Thomas Rast2-1/+16
2012-03-01t5510: ensure we stay in the toplevel test dirThomas Rast1-8/+10
2012-03-01t5510: refactor bundle->pack conversionThomas Rast1-14/+10
2012-03-01diff -p: squelch "diff --git" header for stat-dirty pathsJunio C Hamano2-5/+2
2012-03-01t4011: illustrate "diff-index -p" on stat-dirty pathsJunio C Hamano1-7/+39
2012-03-01t4011: modernise styleJunio C Hamano1-86/+82
2012-03-01diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek8-8/+32
2012-03-01diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek4-2/+30
2012-03-01diff --stat: add a test for output with COLUMNS=40Zbigniew Jędrzejewski-Szmek1-0/+19
2012-03-01diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek3-44/+76
2012-03-01merge --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2-4/+5
2012-03-01log --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2-2/+3
2012-03-01show --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2-2/+4
2012-03-01diff --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek3-3/+16
2012-03-01diff --stat: tests for long filenames and big change countsJunio C Hamano1-0/+182
2012-03-01Documentation fixes in git-configLibor Pechacek2-7/+12
2012-03-01l10n: leave leading space unchanged for zh_CN.pows33891-4/+4
2012-02-29Update l10n guideJunio C Hamano2-22/+94
2012-02-28pickaxe: allow -i to search in patch case-insensitivelyJunio C Hamano4-2/+128
2012-02-28fsck: --no-dangling omits "dangling object" informationJunio C Hamano5-17/+20
2012-02-28grep: use static trans-case tableJunio C Hamano3-8/+42
2012-02-28Update draft release notes to 1.7.10Junio C Hamano1-1/+5
2012-02-28Merge branch 'pj/completion-remote-set-url-branches'Junio C Hamano1-14/+18
2012-02-28Merge branch 'ph/cherry-pick-advice-refinement'Junio C Hamano2-6/+25
2012-02-28Merge branch 'jb/required-filter'Junio C Hamano3-14/+92
2012-02-28Documentation: use {asterisk} in rev-list-options.txt when neededCarlos Martín Nieto1-6/+6
2012-02-28parse-options: remove PARSE_OPT_NEGHELPRené Scharfe4-13/+5
2012-02-28gitweb: Handle invalid regexp in regexp searchJakub Narebski2-1/+20
2012-02-28rev-list: fix --verify-objects --quiet becoming --objectsNguyễn Thái Ngọc Duy2-13/+17
2012-02-28rev-list: remove BISECT_SHOW_TRIED flagNguyễn Thái Ngọc Duy2-12/+1
2012-02-29Merge pull request from jiangxin/masterJiang Xin1-121/+181
2012-02-28l10n: update Chinese translation to the new git.poJiang Xin1-121/+181
2012-02-28l10n: Update git.pot (12 new messages)Jiang Xin1-121/+184
2012-02-28Merge branch 'master' into git-poJiang Xin201-1989/+4948
2012-02-27symbolic-ref --short: abbreviate the output unambiguouslyJan Krüger2-4/+14
2012-02-27Merge branch 'maint'Junio C Hamano3-4/+22
2012-02-27Update draft release notes to 1.7.9.3Junio C Hamano1-0/+7
2012-02-27Merge branch 'pj/remote-set-branches-usage-fix' into maintJunio C Hamano2-2/+2
2012-02-27Merge branch 'jn/gitweb-unborn-head' into maintJunio C Hamano2-2/+11
2012-02-27Merge branch 'jn/ancient-meld-support' into maintJunio C Hamano1-1/+1
2012-02-27Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano1-0/+10
2012-02-27CodingGuidelines: do not use 'which' in shell scriptsTim Henigan1-0/+5
2012-02-27CodingGuidelines: Add a note about spaces after redirectionTim Henigan1-0/+7
2012-02-27contrib: add git-diffall scriptTim Henigan2-0/+292
2012-02-27git-p4: missing she-bang line in t9804 confuses proveZbigniew Jędrzejewski-Szmek1-0/+2
2012-02-27grep -P: add tests for matching ^ and $Michał Kiedrowicz1-0/+23
2012-02-27branch: don't assume the merge filter ref existsCarlos Martín Nieto2-0/+8
2012-02-27post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctlyMichael Haggerty1-3/+3
2012-02-27post-receive-email: remove unused variableMichael Haggerty1-1/+0
2012-02-27send-email: document the --smtp-debug optionZbigniew Jędrzejewski-Szmek1-0/+4
2012-02-27l10n: fast-forward here is ff-only merge, not pushYichao Yu1-1/+1
2012-02-27l10n: update zh_CN translation for "Fetching %s"Riku1-1/+1
2012-02-26Update draft release notes to 1.7.10Junio C Hamano1-6/+35
2012-02-26Merge branch 'jn/gitweb-search-optim'Junio C Hamano1-13/+53
2012-02-26Merge branch 'tr/maint-bundle-long-subject'Junio C Hamano5-51/+67
2012-02-26Merge branch 'sp/smart-http-failure-to-push'Junio C Hamano1-3/+10
2012-02-26Merge branch 'fc/push-prune'Junio C Hamano7-40/+101
2012-02-26Merge branch 'jc/doc-merge-options'Junio C Hamano1-11/+11
2012-02-26Merge branch 'jk/maint-avoid-streaming-filtered-contents'Junio C Hamano4-9/+125
2012-02-26Merge branch 'jb/filter-ignore-sigpipe'Junio C Hamano1-0/+5
2012-02-26test: "am -3" can accept non-standard -p<num>Junio C Hamano1-0/+15
2012-02-26gitweb: Highlight matched part of shortened project descriptionJakub Narebski1-5/+47
2012-02-26gitweb: Highlight matched part of project description when searching projectsJakub Narebski1-2/+6
2012-02-26gitweb: Highlight matched part of project name when searching projectsJakub Narebski1-1/+3
2012-02-26gitweb: Introduce esc_html_match_hl and esc_html_hl_regionsJakub Narebski1-0/+41
2012-02-26pack-objects: Fix compilation with NO_PTHREDSMichał Kiedrowicz1-1/+1
2012-02-26Merge branch 'maint'Junio C Hamano12-72/+291
2012-02-26Document accumulated fixes since 1.7.9.2Junio C Hamano2-1/+18
2012-02-26Merge branch 'jc/add-refresh-unmerged' into maintJunio C Hamano2-2/+24
2012-02-26Merge branch 'js/configure-libintl' into maintJunio C Hamano1-8/+12
2012-02-26Sync with 1.7.8.5Junio C Hamano6-6/+39
2012-02-26Git 1.7.8.5v1.7.8.5Junio C Hamano3-2/+21
2012-02-26grep -P: Fix matching ^ and $Michał Kiedrowicz1-1/+1
2012-02-26am: don't infloop for an empty input fileJim Meyering2-1/+11
2012-02-26rebase -m: only call "notes copy" when rewritten exists and is non-emptyAndrew Wong1-4/+7
2012-02-26git-p4: remove bash-ism in t9800Pete Wyckoff1-9/+15
2012-02-26git-p4: remove bash-ism in t9809Pete Wyckoff1-1/+1
2012-02-26git-p4: fix submit regression with clientSpec and subdir clonePete Wyckoff2-43/+185
2012-02-26git-p4: set useClientSpec variable on initial clonePete Wyckoff3-4/+34
2012-02-26parse-options: allow positivation of options starting, with no-René Scharfe3-12/+20
2012-02-26test-parse-options: convert to OPT_BOOL()René Scharfe2-6/+66
2012-02-26Makefile: add thread-utils.h to LIB_HDmitry V. Levin1-0/+1
2012-02-24Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scalerJunio C Hamano4-29/+58
2012-02-24do not stream large files to pack when filters are in useJeff King2-5/+95
2012-02-24teach dry-run convert_to_git not to require a src bufferJeff King1-2/+10
2012-02-24teach convert_to_git a "dry run" modeJeff King2-2/+20
2012-02-23t5704: match tests to modern styleThomas Rast1-25/+8
2012-02-23strbuf: improve strbuf_get*line documentationThomas Rast1-1/+17
2012-02-23Update draft release notes to 1.7.10Junio C Hamano1-1/+24
2012-02-23Merge branch 'ld/git-p4-expanded-keywords'Junio C Hamano3-10/+501
2012-02-23Merge branch 'jk/config-include'Junio C Hamano8-60/+495
2012-02-23Merge branch 'jc/add-refresh-unmerged'Junio C Hamano2-2/+24
2012-02-23Merge branch 'js/configure-libintl'Junio C Hamano1-8/+12
2012-02-23Merge branch 'pj/remote-set-branches-usage-fix'Junio C Hamano2-2/+2
2012-02-23Merge branch 'tr/perftest'Junio C Hamano14-552/+1363
2012-02-23Merge branch 'maint'Junio C Hamano2-4/+11
2012-02-23git-p4: add initial support for RCS keywordsLuke Diamand3-10/+501
2012-02-23gitweb: Faster project searchJakub Narebski1-2/+7
2012-02-23gitweb: Option for filling only specified info in fill_project_list_infoJakub Narebski1-8/+25
2012-02-23gitweb: Refactor checking if part of project info need fillingJakub Narebski1-8/+26
2012-02-23merge: do not trust fstat(2) too much when checking interactivenessJunio C Hamano1-1/+1
2012-02-23README: point to Documentation/SubmittingPatchesMatthieu Moy1-4/+6
2012-02-23Document merge.branchdesc configuration variableJunio C Hamano1-0/+5
2012-02-23disconnect from remote helpers more gentlyJeff King1-3/+10
2012-02-23bundle: use a strbuf to scan the log for boundary commitsThomas Rast2-7/+24
2012-02-22am -3: allow nonstandard -p<num> optionJunio C Hamano1-4/+7
2012-02-22bundle: put strbuf_readline_fd in strbuf.c with adjustmentsThomas Rast3-19/+19
2012-02-22push: add '--prune' optionFelipe Contreras7-5/+60
2012-02-22Sync with 1.7.9.2Junio C Hamano2-17/+6
2012-02-22Git 1.7.9.2v1.7.9.2Junio C Hamano2-2/+3
2012-02-22remote: refactor code into alloc_delete_ref()Felipe Contreras1-5/+9
2012-02-22remote: reorganize check_pattern_match()Felipe Contreras1-29/+30
2012-02-22remote: use a local variable in match_push_refs()Felipe Contreras1-9/+10
2012-02-22Documentation/merge-options.txt: group "ff" related options togetherJunio C Hamano1-11/+11
2012-02-22completion: normalize increment/decrement stylePhilip Jägenstedt1-12/+10
2012-02-22completion: remote set-* <name> and <branch>Philip Jägenstedt1-3/+9
2012-02-22completion: use tabs for indentationPhilip Jägenstedt1-4/+4
2012-02-22completion: remove stale "to submit patches" documentationPhilip Jägenstedt1-12/+0
2012-02-22git-p4: the option to specify 'host' is -H, not -hRussell Myers1-1/+1
2012-02-22cherry-pick: No advice to commit if --no-commitPhil Hord2-6/+25
2012-02-21t9100: remove bogus " || test" after each test scriptletJunio C Hamano1-5/+9
2012-02-21Merge branch 'master' of git://bogomips.org/git-svnJunio C Hamano3-44/+59
2012-02-21Update draft release notes to 1.7.10Junio C Hamano1-40/+6
2012-02-21Merge branch 'jn/gitweb-unborn-head'Junio C Hamano2-2/+11
2012-02-21Merge branch 'jk/diff-highlight'Junio C Hamano2-37/+181
2012-02-21Merge branch 'maint'Junio C Hamano2-17/+56
2012-02-21Update draft release notes to 1.7.9.2Junio C Hamano1-16/+55
2012-02-21Merge branch 'cb/receive-pack-keep-errors' into maintJunio C Hamano2-11/+35
2012-02-21Merge branch 'cb/transfer-no-progress' into maintJunio C Hamano7-21/+28
2012-02-21Merge branch 'jk/git-dir-lookup' into maintJunio C Hamano5-5/+109
2012-02-21Merge branch 'jc/diff-stat-scaler' into maintJunio C Hamano1-7/+20
2012-02-21Merge branch 'zj/term-columns' into maintJunio C Hamano3-22/+38
2012-02-21Merge branch 'cb/maint-rev-list-verify-object' into maintJunio C Hamano2-2/+28
2012-02-21Merge branch 'cb/maint-t5541-make-server-port-portable' into maintJunio C Hamano1-1/+1
2012-02-21Merge branch 'dp/i18n-libcharset' into maintJunio C Hamano3-0/+16
2012-02-21Merge branch 'jk/grep-binary-attribute' into maintJunio C Hamano5-192/+308
2012-02-21Merge branch 'nd/diffstat-gramnum' into maintJunio C Hamano69-118/+168
2012-02-21Merge branch 'nd/find-pack-entry-recent-cache-invalidation' into maintJunio C Hamano1-38/+46
2012-02-21Merge branch 'tt/profile-build-fix' into maintJunio C Hamano2-22/+50