summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-06-03Git 1.7.10.4v1.7.10.4Junio C Hamano2-1/+6
2012-06-03Merge branch 'ef/maint-rebase-error-message' into maintJunio C Hamano2-1/+6
2012-06-01Start preparing for 1.7.10.4Junio C Hamano3-2/+28
2012-06-01Merge branch 'ef/http-o-depends-on-gvf' into maintJunio C Hamano1-1/+1
2012-06-01Merge branch 'rs/maint-grep-F' into maintJunio C Hamano5-24/+68
2012-06-01Merge branch 'jk/ident-split-fix' into maintJunio C Hamano2-1/+8
2012-06-01Merge branch 'jk/pretty-commit-header-incomplete-line' into maintJunio C Hamano1-1/+4
2012-06-01Merge branch 'jk/format-person-part-buffer-limit' into maintJunio C Hamano1-2/+4
2012-06-01Merge branch 'ap/checkout-no-progress-for-non-tty' into maintJunio C Hamano1-2/+2
2012-06-01Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano1-247/+289
2012-05-31Makefile: add missing GIT-VERSION-FILE dependencyErik Faye-Lund1-1/+1
2012-05-30rebase: report invalid commit correctlyErik Faye-Lund2-1/+6
2012-05-29Update Swedish translation (728t0f0u)Peter Krefting1-247/+289
2012-05-25Git 1.7.10.3v1.7.10.3Junio C Hamano2-5/+16
2012-05-25Merge branch 'hv/submodule-alt-odb' into maintJunio C Hamano4-2/+39
2012-05-25Merge branch 'bp/diff-no-index-strbuf-fix' into maintJunio C Hamano2-2/+27
2012-05-25fmt-merge-message: add empty line between tag and signature verificationLinus Torvalds1-3/+5
2012-05-25config doc: remove confusion about relative GIT_DIR from FILES sectionJonathan Nieder1-3/+1
2012-05-24Update draft release notes to 1.7.10.3Junio C Hamano1-0/+6
2012-05-24Merge branch 'jk/maint-status-porcelain-z-b' into maintJunio C Hamano5-89/+105
2012-05-24checkout: no progress messages if !isatty(2).Avery Pennarun1-2/+2
2012-05-24osxkeychain: pull make config from top-level directoryJeff King1-2/+5
2012-05-22avoid segfault when reading header of malformed commitsJeff King1-1/+4
2012-05-22pretty: avoid buffer overflow in format_person_partJeff King1-2/+4
2012-05-22fix off-by-one error in split_ident_lineJeff King2-1/+8
2012-05-21grep: stop leaking line strings with -fRené Scharfe1-5/+2
2012-05-20grep: support newline separated pattern listRené Scharfe4-3/+41
2012-05-20grep: factor out do_append_grep_pat()René Scharfe1-6/+9
2012-05-20grep: factor out create_grep_pat()René Scharfe1-11/+17
2012-05-20Consistently use "superproject" instead of "supermodule"Jens Lehmann3-4/+4
2012-05-20t3404: begin "exchange commits with -p" test with correct preconditionsJohannes Sixt1-0/+1
2012-05-16diff --no-index: don't leak buffers in queue_diffBobby Powers1-2/+2
2012-05-16diff --no-index: reset temporary buffer lengths on directory iterationBobby Powers2-0/+25
2012-05-15l10n: de.po: translate 3 new messagesRalf Thielow1-101/+127
2012-05-15l10n: zh_CN.po: translate 3 new messagesJiang Xin1-99/+121
2012-05-15l10n: Update git.pot (3 new, 2 removed messages)Jiang Xin1-96/+108
2012-05-14teach add_submodule_odb() to look for alternatesHeiko Voigt4-2/+39
2012-05-14Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano4-515/+538
2012-05-14Start preparing for 1.7.10.3Junio C Hamano2-1/+27
2012-05-14Merge branch 'jk/maint-reflog-walk-count-vs-time' into maintJunio C Hamano7-16/+82
2012-05-14Merge branch 'jk/doc-asciidoc-inline-literal' into maintJunio C Hamano53-194/+192
2012-05-14Merge branch 'ef/checkout-empty' into maintJunio C Hamano2-1/+12
2012-05-14Merge branch 'jk/maint-tformat-with-z' into maintJunio C Hamano2-1/+29
2012-05-14Merge branch 'js/checkout-detach-count' into maintJunio C Hamano2-11/+23
2012-05-14Merge branch 'ef/maint-clone-progress-fix' into maintJunio C Hamano1-1/+1
2012-05-14link to gitmodules page at the beginning of git-submodule documentationHeiko Voigt1-3/+3
2012-05-14pack-protocol: fix first-want separator in the examplesCarlos Martín Nieto1-2/+2
2012-05-12l10n: zh_CN.po: translate 1 new messageJiang Xin1-94/+98
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-08checkout: do not corrupt HEAD on empty repoErik Faye-Lund2-1/+12
2012-05-08l10n: de.po: translate one new messageRalf Thielow1-130/+148
2012-05-08l10n: de.po: unify translation of "ahead" and "behind"Ralf Thielow1-8/+9
2012-05-08l10n: de.po: collection of improvementsRalf Thielow1-125/+129
2012-05-08l10n: de.po: translate "remote" as "extern"Ralf Thielow1-23/+23
2012-05-08l10n: de.po: translate "track" as "beobachten"Ralf Thielow1-12/+12
2012-05-08l10n: add new members to German translation teamRalf Thielow1-0/+3
2012-05-08l10n: de.po: collection of suggestionsThomas Rast1-55/+44
2012-05-08l10n: de.po: translate "bad" as "ungültig" ("invalid")Thomas Rast1-13/+13
2012-05-08l10n: de.po: hopefully uncontroversial fixesThomas Rast1-11/+11
2012-05-08l10n: de.po: translate "bare" as "bloß"Thomas Rast1-2/+2
2012-05-08status: respect "-b" for porcelain formatJeff King5-11/+16
2012-05-08status: fix null termination with "-b"Jeff King2-3/+13
2012-05-08status: refactor null_termination optionJeff King3-24/+24
2012-05-08commit: refactor option parsingJeff King1-58/+59
2012-05-08l10n: Update git.pot (1 new messages)Jiang Xin1-94/+98
2012-05-07Documentation/git-config: describe and clarify "--local <file>" optionFlorian Achleitner1-5/+9
2012-05-07reflog-walk: tell explicit --date=default from not having --date at allJunio C Hamano5-17/+15
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-07Merge branch 'ef/maint-1.7.6-clone-progress-fix' into ef/maint-clone-progress...Junio C Hamano1-1/+1
2012-05-07clone: fix progress-regressionErik Faye-Lund1-1/+1
2012-05-07grep.c: remove redundant line of codeAngus Hammond1-1/+1
2012-05-07git p4 doc: fix formattingPete Wyckoff1-1/+3
2012-05-04checkout (detached): truncate list of orphaned commits at the new HEADJohannes Sixt2-7/+8
2012-05-04t2020-checkout-detach: check for the number of orphaned commitsJohannes Sixt1-5/+16
2012-05-04reflog-walk: always make HEAD@{0} show indexed selectorsJeff King2-1/+10
2012-05-04reflog-walk: clean up "flag" field of commit_reflog structJeff King1-3/+12
2012-05-04log: respect date_mode_explicit with --format:%gdJeff King5-2/+7
2012-05-04t1411: add more selector index/date testsJeff King1-0/+45
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-01log-tree: the previous one is still not quite rightJunio C Hamano1-0/+16
2012-05-01log-tree: use custom line terminator in line termination modeJan Krüger2-1/+13
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-26docs: stop using asciidoc no-inline-literalJeff King53-194/+192
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