summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-05-11Git 1.7.10.2v1.7.10.2Junio C Hamano3-2/+17
2012-05-11Merge branch 'jc/diff-algo-cleanup' into maintJunio C Hamano8-25/+24
2012-05-11Merge branch 'ct/advise-push-default' into maintJunio C Hamano10-13/+99
2012-05-11Merge branch 'js/fast-import-test-9300' into maintJunio C Hamano1-34/+54
2012-05-11Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maintJunio C Hamano7-53/+107
2012-05-11Merge branch 'ah/maint-grep-double-init' into maintJunio C Hamano1-1/+1
2012-05-11Merge branch 'fa/maint-config-doc' into maintJunio C Hamano1-5/+9
2012-05-11Merge branch 'rs/unpack-trees-leakfix' into maintJunio C Hamano1-10/+17
2012-05-11Merge branch 'sl/test-wc-l-line-count' into maintJunio C Hamano19-74/+65
2012-05-11Merge branch 'rl/show-empty-prefix' into maintJunio C Hamano2-1/+3
2012-05-11document submdule.$name.update=none option for gitmodulesHeiko Voigt2-6/+6
2012-05-10Update draft release notes to 1.7.10.2Junio C Hamano1-0/+25
2012-05-10Merge branch 'mm/include-userpath' into maintJunio C Hamano3-1/+18
2012-05-10Merge branch 'cc/fix-missing-va-end-in-revert' into maintJunio C Hamano1-0/+1
2012-05-10Merge branch 'bw/test-fix-grep-gnuism' into maintJunio C Hamano1-2/+2
2012-05-10Merge branch 'jk/http-backend-keep-committer-ident-env' into maintJunio C Hamano3-13/+37
2012-05-10Merge branch 'nl/rebase-i-cheat-sheet' into maintJunio C Hamano1-0/+2
2012-05-10Merge branch 'bw/submodule-sed-solaris' into maintJunio C Hamano1-2/+3
2012-05-10Merge branch 'jk/maint-push-progress' into maintJunio C Hamano3-2/+39
2012-05-10Merge branch 'jc/rerere-train' into maintJunio C Hamano1-1/+1
2012-05-10Merge branch 'lp/diffstat-with-graph' into maintJunio C Hamano5-6/+131
2012-05-07Documentation/git-config: describe and clarify "--local <file>" optionFlorian Achleitner1-5/+9
2012-05-07Start preparing for 1.7.10.2Junio C Hamano2-1/+47
2012-05-07Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maintJunio C Hamano3-3/+3
2012-05-07Merge branch 'js/daemon-test-race-fix' into maintJunio C Hamano1-11/+11
2012-05-07Merge branch 'jk/maint-config-bogus-section' into maintJunio C Hamano2-1/+31
2012-05-07Merge branch 'pw/t5800-import-race-fix' into maintJunio C Hamano2-0/+20
2012-05-07Merge branch 'rt/cherry-revert-conflict-summary' into maintJunio C Hamano1-1/+1
2012-05-07Merge branch 'cb/maint-report-mount-point-correctly-in-setup' into maintJunio C Hamano1-9/+13
2012-05-07grep.c: remove redundant line of codeAngus Hammond1-1/+1
2012-05-07git p4 doc: fix formattingPete Wyckoff1-1/+3
2012-05-03Merge branch 'jc/merge-reduce-parents-early' into maintJunio C Hamano5-71/+276
2012-05-03Merge branch 'cb/cherry-pick-rev-path-confusion' into maintJunio C Hamano3-11/+19
2012-05-03Merge branch 'cb/http-multi-curl-auth' into maintJunio C Hamano2-10/+26
2012-05-03Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintJunio C Hamano2-4/+43
2012-05-03Merge branch 'rl/maint-stash-i18n-save-error' into maintJunio C Hamano1-2/+2
2012-05-03Merge branch 'jm/maint-strncpy-diff-no-index' into maintJunio C Hamano1-21/+17
2012-05-01Git 1.7.10.1v1.7.10.1Junio C Hamano3-3/+32
2012-05-01Merge branch 'pw/fast-import-dataref-parsing' into maintJunio C Hamano2-33/+364
2012-05-01Merge branch 'it/fetch-pack-many-refs' into maintJunio C Hamano6-6/+162
2012-05-01Merge branch 'jl/maint-submodule-recurse-fetch' into maintJunio C Hamano1-3/+3
2012-05-01Merge branch 'jc/maint-blame-minimal' into maintJunio C Hamano1-0/+1
2012-05-01Merge branch 'lp/maint-diff-three-dash-with-graph' into maintJunio C Hamano3-2/+299
2012-05-01Merge branch 'jk/rebase-i-submodule-conflict-only' into maintJunio C Hamano2-1/+31
2012-05-01Merge branch 'maint' of https://github.com/git-l10n/git-poJunio C Hamano6-282/+7605
2012-05-01Consistently use perl from /usr/bin/ for scriptsZbigniew Jędrzejewski-Szmek2-2/+2
2012-05-01t/gitweb-lib: use $PERL_PATH to run gitwebJeff King1-1/+1
2012-05-01t5541: test more combinations of --progressJeff King1-2/+25
2012-05-01teach send-pack about --[no-]progressJeff King2-2/+13
2012-05-01send-pack: show progress when isatty(2)Jeff King1-0/+3
2012-05-01l10n: Initial German translationRalf Thielow1-717/+984
2012-04-30contrib/rerere-train: use installed git-sh-setupJunio C Hamano1-1/+1
2012-04-29config: expand tildes in include.path variableJeff King3-1/+18
2012-04-28l10n: Update Simplified Chinese translationJiang Xin1-84/+100
2012-04-28l10n: Update git.pot (2 new messages)Jiang Xin1-83/+96
2012-04-28Merge maint branch for tracking l10n updates of git stable versionJiang Xin40-213/+779
2012-04-28l10n: Add the German translation team and initialize de.poRalf Thielow2-0/+3508
2012-04-27t4052: work around shells unable to set COLUMNS to 1Zbigniew Jędrzejewski-Szmek1-2/+4
2012-04-27Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graphJunio C Hamano1-0/+1
2012-04-27test-lib: skip test with COLUMNS=1 under mkshZbigniew Jędrzejewski-Szmek1-0/+1
2012-04-27t5570: fix forwarding of git-daemon messages via catJohannes Sixt1-11/+11
2012-04-26Start preparing for 1.7.10.1Junio C Hamano2-1/+51
2012-04-26Merge branch 'jk/run-command-eacces' into maintJunio C Hamano6-7/+86
2012-04-26Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2-8/+72
2012-04-26Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maintJunio C Hamano2-11/+43
2012-04-26Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano9-14/+45
2012-04-26Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maintJunio C Hamano1-1/+1
2012-04-26Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano3-24/+65
2012-04-26Merge branch 'jk/add-p-skip-conflicts' into maintJunio C Hamano2-7/+44
2012-04-26Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano5-47/+141
2012-04-26Merge branch 'tr/maint-word-diff-regex-sticky' into maintJunio C Hamano2-56/+102
2012-04-26Merge branch 'jh/notes-merge-in-git-dir-worktree' into maintJunio C Hamano4-32/+73
2012-04-26Sync with 1.7.9.7Junio C Hamano5-4/+55
2012-04-26Git 1.7.9.7v1.7.9.7Junio C Hamano3-2/+16
2012-04-26Sync with 1.7.8.6Junio C Hamano4-3/+40
2012-04-26Git 1.7.8.6v1.7.8.6Junio C Hamano4-3/+27
2012-04-26Sync with 1.7.7.7Junio C Hamano3-2/+16
2012-04-26Git 1.7.7.7v1.7.7.7Junio C Hamano4-3/+18
2012-04-26diff --no-index: use strbuf for temporary pathnamesJunio C Hamano1-23/+17
2012-04-26bundle: remove stray single-quote from error messageJonathan Nieder1-1/+1
2012-04-25config: reject bogus section names for --rename-sectionJeff King2-1/+31
2012-04-24git-remote-testgit: fix race when spawning fast-importPete Wyckoff2-0/+20
2012-04-21revert: add missing va_endChristian Couder1-0/+1
2012-04-20t9300-fast-import: avoid 'exit' in test_expect_success snippetsJohannes Sixt1-34/+54
2012-04-19sequencer: remove additional blank lineRalf Thielow1-1/+1
2012-04-19t9400: fix gnuism in grepJunio C Hamano1-2/+2
2012-04-18fmt-merge-msg: discard needless merge parentsJunio C Hamano2-10/+149
2012-04-18gc: use argv-array for sub-commandsJeff King1-45/+33
2012-04-18argv-array: add a new "pushl" methodJeff King3-0/+17
2012-04-18argv-array: refactor empty_argv initializationJeff King2-3/+2
2012-04-18Prevent graph_width of stat width from falling below minLucian Poston2-8/+12
2012-04-18t4052: Test diff-stat output with minimum columnsLucian Poston1-0/+28
2012-04-17builtin/merge.c: reduce parents earlyJunio C Hamano4-28/+43
2012-04-17builtin/merge.c: collect other parents earlyJunio C Hamano1-13/+27
2012-04-17builtin/merge.c: remove "remoteheads" global variableJunio C Hamano1-23/+28
2012-04-17merge tests: octopus with redundant parentsMichał Kiedrowicz3-7/+39
2012-04-17fetch: describe new refs based on where it came fromMarc Branchaud2-3/+41
2012-04-17fetch: Give remote_ref to update_local_ref() as wellMarc Branchaud1-1/+2
2012-04-16t4052: Adjust --graph --stat output for prefixesLucian Poston1-9/+25
2012-04-16Adjust stat width calculations to take --graph output into accountLucian Poston1-1/+1
2012-04-16Add output_prefix_length to diff_optionsLucian Poston2-0/+4
2012-04-16t4052: test --stat output with --graphZbigniew Jędrzejewski-Szmek1-4/+74
2012-04-16diff: avoid stack-buffer-read-overrun for very long nameJim Meyering1-0/+2
2012-04-15cherry-pick: do not expect file argumentsClemens Buchacher3-11/+19
2012-04-15properly keep track of current working directoryClemens Buchacher1-9/+13
2012-04-14stash: use eval_gettextln correctlyRoss Lagerwall1-2/+2
2012-04-14submodules: recursive fetch also checks new tags for submodule commitsJens Lehmann1-3/+3
2012-04-14http: use newer curl options for setting credentialsJeff King1-2/+11
2012-04-14http: clean up leak in init_curl_http_authJeff King1-3/+3
2012-04-12Fix httpd tests that broke when non-ff push advice changedChristopher Tiwald2-2/+2
2012-04-12l10n: Add Danish team (da) to list of teamsByrial Jensen1-0/+4
2012-04-12l10n: New da.po file with 0 translationsByrial Jensen1-0/+3503
2012-04-11blame: accept --need-minimalJunio C Hamano1-0/+1
2012-04-11gc: do not explode objects which will be immediately prunedJeff King4-11/+61
2012-04-11tests: modernise style: more uses of test_line_countStefano Lattarini19-74/+65
2012-04-10unpack-trees: plug minor memory leakRené Scharfe1-9/+16
2012-04-10unpack-trees: don't perform any index operation if we're not mergingRené Scharfe1-1/+1
2012-04-11l10n: Updated pt_PT languageMarco Sousa1-115/+127
2012-04-10remote-curl: main test case for the OS command line overflowIvan Todoroski1-0/+31
2012-04-10fetch-pack: test cases for the new --stdin optionIvan Todoroski1-0/+66
2012-04-10remote-curl: send the refs to fetch-pack on stdinIvan Todoroski1-5/+13
2012-04-10fast-import: tighten parsing of datarefsPete Wyckoff2-33/+364
2012-04-10Merge branch 'maint-1.7.9' into maintJunio C Hamano0-0/+0
2012-04-10Merge branch 'maint-1.7.8' into maint-1.7.9Junio C Hamano2-6/+6
2012-04-10test-subprocess: fix segfault without argumentsRené Scharfe1-3/+3
2012-04-10submodule: fix prototype of gitmodules_configRené Scharfe1-1/+1
2012-04-10rev-parse --show-prefix: add in trailing newlineRoss Lagerwall2-1/+3
2012-04-10fix http auth with multiple curl handlesJeff King2-5/+7
2012-04-10http auth fails with multiple curl handlesClemens Buchacher1-10/+15
2012-04-09rebase -i continue: don't skip commits that only change submodulesJohn Keeping2-1/+31
2012-04-09Avoid bug in Solaris xpg4/sed as used in submoduleBen Walton1-2/+3
2012-04-09Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8Junio C Hamano1-4/+4
2012-04-09Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8Junio C Hamano1-2/+2
2012-04-09Merge branch 'tr/cache-tree' into maint-1.7.8Junio C Hamano10-11/+142
2012-04-09Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8Junio C Hamano2-4/+33
2012-04-09Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8Junio C Hamano1-6/+6
2012-04-09Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8Junio C Hamano2-23/+36
2012-04-09Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8Junio C Hamano5-51/+67
2012-04-09Merge branch 'ph/rerere-doc' into maint-1.7.8Junio C Hamano1-7/+12
2012-04-06Git 1.7.10v1.7.10Junio C Hamano3-11/+19
2012-04-06spec: add missing build dependencyFelipe Contreras1-0/+1
2012-04-05run-command: treat inaccessible directories as ENOENTJeff King4-3/+80
2012-04-05compat/mingw.[ch]: Change return type of exec functions to intRamsay Jones2-4/+6
2012-04-05push: error out when the "upstream" semantics does not make senseJunio C Hamano2-8/+72
2012-04-05add--interactive: ignore unmerged entries in patch modeJeff King2-7/+44
2012-04-03Documentation/git-commit: rephrase the "initial-ness" of templatesJunio C Hamano1-5/+8
2012-04-03Git 1.7.10-rc4v1.7.10-rc4Junio C Hamano2-8/+8
2012-04-02Merge branch 'pt/gitk'Junio C Hamano1-1/+2
2012-04-02fetch-pack: new --stdin option to read refs from stdinIvan Todoroski3-1/+52
2012-04-02Sync with 1.7.9.6Junio C Hamano3-6/+17
2012-04-02Git 1.7.9.6v1.7.9.6Junio C Hamano4-4/+18
2012-04-02Merge branch 'jc/maint-merge-autoedit' into maintJunio C Hamano2-3/+40
2012-04-02gitk: fix setting font display with new tabbed dialog layout.Pat Thoyts1-1/+1
2012-04-02gitk: fix tabbed preferences construction when using tcl 8.4Pat Thoyts1-0/+1
2012-04-02Merge git://github.com/git-l10n/git-poJunio C Hamano4-19/+7103
2012-04-02l10n: Add the Dutch translation team and initialize nl.poVincent van Ravesteijn2-0/+3497
2012-04-02l10n: Inital Portuguese Portugal language (pt_PT)Marco Sousa2-0/+3587
2012-04-01git-commit.txt: clarify -t requires editing messageAdam Monsen1-5/+5
2012-03-30Merge branch 'maint'Junio C Hamano1-1/+3
2012-03-30commit: rephrase the error when user did not touch templated log messageJunio C Hamano2-19/+47
2012-03-30commit: do not trigger bogus "has templated message edited" checkJunio C Hamano2-0/+8
2012-03-30t7501: test the right kind of breakageJunio C Hamano1-0/+2
2012-03-30http-backend: respect existing GIT_COMMITTER_* variablesJeff King3-13/+37
2012-03-30string-list: document that string_list_insert() inserts unique stringsHeiko Voigt1-1/+3
2012-03-30l10n: Improve zh_CN translation for Git 1.7.10-rc3Jiang Xin1-19/+19
2012-03-28config: remove useless assignmentRené Scharfe1-2/+0
2012-03-28Git 1.7.10-rc3v1.7.10-rc3Junio C Hamano2-11/+11
2012-03-28correct a few doubled-word nits in comments and documentationJim Meyering4-4/+4
2012-03-28correct spelling: an URL -> a URLJim Meyering8-9/+9
2012-03-27l10n updates for Git 1.7.10-rc1Junio C Hamano4-292/+310
2012-03-27tests: unset COLUMNS inherited from environmentZbigniew Jędrzejewski-Szmek1-1/+1
2012-03-27Add url of Swedish l10n team in TEAMS fileJiang Xin1-0/+1
2012-03-27l10n: Review zh_CN translation for Git 1.7.10-rc1Jiang Xin1-250/+252
2012-03-27Update Swedish translation (724t0f0u).Peter Krefting1-18/+23
2012-03-26clean up struct ref's nonfastforward fieldJeff King2-4/+3
2012-03-26Update draft release notes to 1.7.10Junio C Hamano1-21/+7
2012-03-26Sync with 1.7.9.5Junio C Hamano4-3/+38
2012-03-26Git 1.7.9.5v1.7.9.5Junio C Hamano4-3/+27
2012-03-26Merge branch 'jn/maint-fast-import-empty-ls' into maintJunio C Hamano2-0/+43
2012-03-26Merge branch 'ph/rerere-doc' into maintJunio C Hamano1-7/+12
2012-03-26Merge branch 'ms/maint-config-error-at-eol-linecount' into maintJunio C Hamano2-4/+40
2012-03-26grep doc: add --break / --heading / -W to synopsisMark Lodato1-0/+2
2012-03-26Documentation: improve description of GIT_EDITOR and preference orderRodrigo Silva (MestreLion)1-0/+6
2012-03-26documentation: fix alphabetic ordered list for git-rebase man pageNelson Benitez Leon1-2/+5
2012-03-25combine-diff: fix loop index underflowRené Scharfe1-1/+1
2012-03-24Merge gitk changes from Paul Mackerras at git://ozlabs.org/~paulus/gitkJunio C Hamano1-130/+282
2012-03-24gitk: Teach gitk to respect log.showrootMarcus Karlsson1-1/+9
2012-03-23Git 1.7.10-rc2v1.7.10-rc2Junio C Hamano2-2/+18
2012-03-23.mailmap: unify various old mail addresses of gitsterJunio C Hamano1-1/+7
2012-03-23Merge branch 'am/completion-zsh-fix'Junio C Hamano1-1/+2
2012-03-23Merge branch 'dw/gitweb-doc-grammo'Junio C Hamano1-2/+2
2012-03-23merge-recursive: don't detect renames of empty filesJeff King2-0/+17
2012-03-23teach diffcore-rename to optionally ignore empty contentJeff King3-1/+12
2012-03-23make is_empty_blob_sha1 available everywhereJeff King2-10/+13
2012-03-23drop casts from users EMPTY_TREE_SHA1_BINJeff King3-3/+3
2012-03-23Documentation/gitweb: trivial English fixesD Waitzman1-2/+2
2012-03-23gitk: Add menu items for comparing a commit with the marked commitPaul Mackerras1-9/+29
2012-03-21contrib/completion: "local var=()" is misinterpreted as func-decl by zshAlex Merry1-1/+2
2012-03-20Merge branch 'maint'Junio C Hamano0-0/+0
2012-03-20Merge branch 'maint-1.7.8' into maintJunio C Hamano5-16/+34