summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-10-21Git 1.7.3.2v1.7.3.2Junio C Hamano4-3/+9
2010-10-21Merge branch 'sn/doc-opt-notation' into maintJunio C Hamano55-157/+157
2010-10-21Merge branch 'mg/fix-build-remote-helpers' into maintJunio C Hamano1-0/+3
2010-10-19t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'Antonio Ospite1-1/+1
2010-10-19Clarify and extend the "git diff" format documentationAndreas Gruenbacher1-10/+30
2010-10-19git-show-ref.txt: clarify the pattern matchingMichael J Gruber1-1/+5
2010-10-19documentation: git-config minor cleanupsCliff Frey1-7/+7
2010-10-19Update test script annotate-tests.sh to handle missing/extra authorsKevin Ballard1-6/+6
2010-10-13Better advice on using topic branches for kernel developmentLuck, Tony1-3/+6
2010-10-13Documentation: update implicit "--no-index" behavior in "git diff"Jonathan Nieder1-3/+3
2010-10-13Documentation: expand 'git diff' SEE ALSO sectionJonathan Nieder1-2/+6
2010-10-13Documentation: diff can compare blobsJonathan Nieder1-2/+3
2010-10-13Documentation: gitrevisions is in section 7Jonathan Nieder16-20/+20
2010-10-13shell portability: no "export VAR=VAL"Junio C Hamano6-23/+23
2010-10-13CodingGuidelines: reword parameter expansion sectionJunio C Hamano1-12/+15
2010-10-13Documentation: update-index: -z applies also to --index-infoBert Wesarg1-2/+2
2010-10-08Documentation: No argument of ALLOC_GROW should have side-effectsJonathan Nieder1-1/+1
2010-10-08Fix {update,checkout}-index usage stringsŠtěpán Němec2-2/+2
2010-10-08Put a space between `<' and argument in pack-objects usage stringŠtěpán Němec1-1/+1
2010-10-08Remove stray quotes in --pretty and --format documentationŠtěpán Němec2-3/+3
2010-10-08Use parentheses and `...' where appropriateŠtěpán Němec31-33/+33
2010-10-08Fix odd markup in --diff-filter documentationŠtěpán Němec1-2/+2
2010-10-08Use angles for placeholders consistentlyŠtěpán Němec27-118/+118
2010-10-06t/t3415: use && where applicable.Yann Dirson1-3/+3
2010-10-06SubmittingPatches: Document some extra tags used in commit messagesRamkumar Ramachandra1-6/+15
2010-10-06Documentation/git-clone: describe --mirror more verboselyUwe Kleine-König1-1/+6
2010-10-06do not depend on signed integer overflowErik Faye-Lund4-3/+15
2010-10-06work around buggy S_ISxxx(m) implementationsRené Scharfe1-3/+10
2010-10-06xdiff: cast arguments for ctype functions to unsigned charJonathan Nieder3-10/+11
2010-10-06init: plug tiny one-time memory leakJonathan Nieder1-13/+19
2010-10-05diffcore-pickaxe.c: remove unnecessary curly bracesBrandon Casey1-2/+1
2010-10-05Merge early part of git-svn into maintJunio C Hamano3-5/+69
2010-10-03t3020 (ls-files-error-unmatch): remove stray '1' from end of fileElijah Newren1-1/+0
2010-10-03setup: make sure git dir path is in a permanent bufferJonathan Nieder1-1/+3
2010-10-03environment.c: remove unused variableJonathan Nieder1-3/+1
2010-09-30Fix typo in pack-objects' usageJohannes Schindelin1-1/+1
2010-09-30Make sure that git_getpass() never returns NULLJohannes Schindelin1-2/+6
2010-09-30t0004 (unwritable files): simplify error handlingJonathan Nieder1-38/+14
2010-09-30rev-list-options: clarify --parents and --childrenMichael J Gruber1-4/+4
2010-09-29MinGW: avoid collisions between "tags" and "TAGS"Junio C Hamano1-6/+9
2010-09-29diff: trivial fix for --output file error messageMatthieu Moy1-1/+1
2010-09-29user-manual: fix anchor name Finding-comments-With-given-ContentMichael J Gruber1-1/+1
2010-09-29user-manual: be consistent in illustrations to 'git rebase'Kirill Smelkov1-2/+2
2010-09-29stash: simplify parsing fixesJon Seymour1-21/+7
2010-09-29Git 1.7.3.1v1.7.3.1Junio C Hamano4-3/+18
2010-09-29stash: fix git stash branch regression when branch creation failsJon Seymour2-4/+4
2010-09-29stash drops the stash even if creating the branch fails because it already ex...Tomas Carnecky1-0/+11
2010-09-27Fix missing 'does' in man-page for 'git checkout'Linus Torvalds1-8/+8
2010-09-27dir.c: squelch false uninitialized memory warningPat Notz1-1/+1
2010-09-27git-send-email.perl: ensure $domain is defined before using itBrandon Casey1-1/+1
2010-09-27wt-status.c: don't leak directory entries when processing untracked,ignoredBrandon Casey1-10/+6
2010-09-27t6050 (replace): fix bogus "fetch branch with replacement" testChristian Couder1-3/+10
2010-09-27Documentation: Refer to git-commit-tree in git-filter-branch helpWesley J. Landaker1-1/+1
2010-09-27update comment and documentation for :/foo syntaxMatthieu Moy2-1/+4
2010-09-27Improvements to `git checkout -h`Daniel Knittl-Frank1-6/+6
2010-09-27contrib/completion: --no-index option to git diffMichael J Gruber1-1/+1
2010-09-27prefer test -h over test -L in shell scriptsJeff King3-5/+5
2010-09-27CodingGuidelines: spell Arithmetic Expansion with $(($var))Junio C Hamano1-0/+4
2010-09-27t1503: Fix arithmetic expansion syntax error when using dashRamsay Jones1-2/+2
2010-09-27remote-helpers: build in platform independent directoryMichael J Gruber1-0/+3
2010-09-27strbuf.h: fix comment typoPat Notz1-1/+1
2010-09-26git-stash: fix flag parsingBrian Gernhardt2-8/+15
2010-09-26t/t3903-stash: improve testing of git-stash showBrandon Casey1-4/+58
2010-09-24git-svn: fix processing of decorated commit hashesMathias Lafeldt1-1/+2
2010-09-24git-svn: check_cherry_pick should exclude commits already in our historySteven Walter2-1/+53
2010-09-24Documentation/git-svn: discourage "noMetadata"Eric Wong1-3/+14
2010-09-18Git 1.7.3v1.7.3Junio C Hamano3-14/+8
2010-09-18Merge branch 'js/ls-files-x-doc'Junio C Hamano1-5/+6
2010-09-17git-rebase--interactive.sh: replace cut with ${v%% *}Chris Johnsen1-1/+1
2010-09-17t/t7300: workaround ancient touch by rearranging argumentsBrandon Casey1-1/+1
2010-09-16Merge branch 'bg/fix-t7003'Junio C Hamano1-38/+41
2010-09-15ls-files documentation: reword for consistencyJunio C Hamano1-4/+4
2010-09-15git-ls-files.txt: clarify -x/--exclude optionJay Soffian1-2/+3
2010-09-15Git 1.7.3 rc2v1.7.3-rc2Junio C Hamano2-3/+9
2010-09-15Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'Junio C Hamano2-0/+11
2010-09-15Merge branch 'os/fix-rebase-diff-no-prefix'Junio C Hamano1-0/+1
2010-09-15Merge branch 'jl/fix-test'Junio C Hamano35-491/+604
2010-09-15Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'Junio C Hamano3-14/+40
2010-09-15Merge branch 'ch/maint-cannot-create-bundle-error'Junio C Hamano2-2/+11
2010-09-15Merge branch 'ks/recursive-rename-add-identical'Junio C Hamano2-0/+41
2010-09-15Merge git://repo.or.cz/git-guiJunio C Hamano6-411/+454
2010-09-14git-gui 0.13gitgui-0.13.0Pat Thoyts1-1/+1
2010-09-13git-gui: avoid mis-encoding the copyright message on Windows.Pat Thoyts1-2/+2
2010-09-13git-gui: Update Swedish translation (521t).Peter Krefting1-399/+403
2010-09-13t7003: Use test_commit instead of custom functionBrian Gernhardt1-38/+41
2010-09-12Merge branch 'maint'Junio C Hamano2-63/+70
2010-09-12ls-tree $di $dir: do not mistakenly recurse into directoriesJunio C Hamano2-0/+11
2010-09-12t3101: modernise styleJunio C Hamano1-62/+64
2010-09-12vcs-svn: Fix some printf format compiler warningsRamsay Jones3-5/+10
2010-09-11compat/nedmalloc: don't force NDEBUG on the rest of gitRené Scharfe1-1/+6
2010-09-10Git 1.7.3 rc1v1.7.3-rc1Junio C Hamano1-1/+1
2010-09-10Merge branch 'np/relnotes-in-subdir'Junio C Hamano111-108/+108
2010-09-10Prepare for 1.7.3 rc1Junio C Hamano1-2/+10
2010-09-10Merge branch 'maint'Junio C Hamano1-2/+3
2010-09-10config.txt: fix placement of diff.noprefixMark Lodato1-2/+3
2010-09-10t/t4018: avoid two unnecessary sub-shell invocationsBrandon Casey1-4/+4
2010-09-09Merge branch 'maint'Junio C Hamano2-4/+6
2010-09-09t/t4018: test whether the word_regex patterns compileBrandon Casey1-0/+5
2010-09-09xdiff-interface.c: always trim trailing space from xfuncname matchesBrandon Casey1-3/+2
2010-09-09diff.c: call regfree to free memory allocated by regcomp when necessaryBrandon Casey1-1/+4
2010-09-09t/t5510-fetch.sh: improve testing with explicit URL and merge specBrandon Casey1-2/+28
2010-09-09builtin/fetch.c: comment that branch->remote_name is usable when has_mergeBrandon Casey1-0/+3
2010-09-09Makefile: use compat regex on IRIX 6.5Brandon Casey1-0/+2
2010-09-09t/t7008: workaround broken handling of \000 by printf on IRIXBrandon Casey1-7/+7
2010-09-09Add --src/dst-prefix to git-formt-patch in git-rebase.shOded Shimon1-0/+1
2010-09-09install-webdoc: keep installed RelNotes-*.txtJunio C Hamano1-1/+1
2010-09-09t1020: Get rid of 'cd "$HERE"' at the start of each testJens Lehmann1-41/+50
2010-09-09t2016 (checkout -p): add missing &&Jonathan Nieder1-1/+1
2010-09-09t1302 (core.repositoryversion): style tweaksJonathan Nieder1-24/+40
2010-09-09t2105 (gitfile): add missing &&Jonathan Nieder1-1/+1
2010-09-09t1450 (fsck): remove dangling objectsJonathan Nieder1-58/+82
2010-09-09tests: subshell indentation stylefixJonathan Nieder22-192/+260
2010-09-08Merge branch 'tf/cleanup-builtin-help-headers'Junio C Hamano3-11/+13
2010-09-08Merge branch 'jk/test-must-fail-missing'Junio C Hamano1-2/+21
2010-09-08Merge branch 'jh/error-removing-missing-note'Junio C Hamano4-9/+30
2010-09-08Merge branch 'kf/askpass-config'Junio C Hamano7-5/+26
2010-09-08Merge branch 'bc/maint-fetch-url-only'Junio C Hamano2-1/+9
2010-09-08Merge branch 'jk/maint-pass-c-config-in-env'Junio C Hamano5-5/+83
2010-09-08Merge branch 'en/d-f-conflict-fix'Junio C Hamano1-1/+9
2010-09-08fast-export: ensure that a renamed file is printed after all referencesJohannes Sixt1-1/+9
2010-09-06Documentation: move RelNotes into a directory of their ownNicolas Pitre111-107/+107
2010-09-06Merge branch 'maint'Junio C Hamano1-1/+3
2010-09-06revert: Fix trivial comment style issueElijah Newren1-1/+0
2010-09-06cache_tree_free: Fix small memory leakElijah Newren1-1/+3
2010-09-06Merge branch 'jh/clean-exclude'Junio C Hamano1-1/+1
2010-09-06builtin/clean.c: Use STRING_LIST_INIT_NODUP.Thiago Farina1-1/+1
2010-09-06Merge branch 'jl/maint-fix-test'Junio C Hamano32-260/+256
2010-09-06Several tests: cd inside subshell instead of aroundJens Lehmann32-260/+256
2010-09-06t3404 & t7508: cd inside subshell instead of aroundJens Lehmann2-4/+4
2010-09-06Merge branch 'maint'v1.7.3-rc0Junio C Hamano3-11/+11
2010-09-06Merge branch 'xx/trivial' into maintJunio C Hamano3-11/+11
2010-09-05tag.c: whitespace breakages fixJunio C Hamano1-9/+9
2010-09-05Fix whitespace issue in object.cJared Hance1-4/+4
2010-09-05t5505: add missing &&Jens Lehmann1-1/+1
2010-09-04Merge branch 'jl/submodule-ignore-diff'Junio C Hamano3-5/+42
2010-09-04Merge branch 'ab/test-2'Junio C Hamano51-559/+968
2010-09-03Merge branch 'js/detached-stash'Junio C Hamano3-83/+268
2010-09-03Merge branch 'js/maint-reflog-beyond-horizon'Junio C Hamano3-9/+29
2010-09-03Merge branch 'dg/local-mod-error-messages'Junio C Hamano7-64/+69
2010-09-03Merge branch 'nd/maint-fix-replace'Junio C Hamano2-2/+2
2010-09-03parse_object: pass on the original sha1, not the replaced oneNguyễn Thái Ngọc Duy2-2/+2
2010-09-03RE: [PATCH] Avoid rename/add conflict when contents are identicalSchalk, Ken2-0/+41
2010-09-03Merge branch 'ab/compat-regex'Junio C Hamano10-5105/+11193
2010-09-03Merge branch 'nd/clone-depth-zero'Junio C Hamano1-2/+5
2010-09-03Merge branch 'jn/maint-doc-user-manual-html-doctype'Junio C Hamano2-2/+5
2010-09-03Merge branch 'cb/maint-mergetool-no-tty'Junio C Hamano2-3/+7
2010-09-03Merge branch 'jn/apply-filename-with-sp'Junio C Hamano21-41/+456
2010-09-03Merge branch 'jn/merge-custom-no-trivial'Junio C Hamano2-26/+71
2010-09-03Merge branch 'jc/maint-doc-em-dash'Junio C Hamano7-18/+19
2010-09-03Merge branch 'mg/doc-bundle'Junio C Hamano1-33/+34
2010-09-03Merge branch 'jn/doc-backslash'Junio C Hamano26-59/+64
2010-09-03Merge branch 'jn/update-contrib-example-merge'Junio C Hamano9-562/+701
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano18-170/+785
2010-09-03Sync with 1.7.2.3Junio C Hamano3-9/+6
2010-09-03Git 1.7.2.3v1.7.2.3Junio C Hamano3-9/+3
2010-09-03builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina1-1/+4
2010-09-03t7406 & t7407: add missing && at end of linesJens Lehmann2-3/+3
2010-09-03t7405: cd inside subshell instead of aroundJens Lehmann1-11/+6
2010-09-03t7609-merge-co-error-msgs: test non-fast forward case too.Matthieu Moy1-2/+10
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy4-9/+3
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy5-5/+8
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy6-54/+54
2010-09-01Prepare for 1.7.3Junio C Hamano2-1/+74
2010-09-01Merge branch 'maint'Junio C Hamano2-1/+47
2010-09-01Prepare for 1.7.2.3Junio C Hamano2-1/+47
2010-09-01Merge branch 'gp/pack-refs-remove-empty-dirs' into maintJunio C Hamano2-0/+38
2010-09-01Merge branch 'sg/rerere-gc-old-still-used' into maintJunio C Hamano4-11/+41
2010-09-01Merge branch 'np/maint-huge-delta-generation' into maintJunio C Hamano1-1/+8
2010-09-01Merge branch 'dj/fetch-tagopt' into maintJunio C Hamano4-7/+56
2010-09-01Merge branch 'da/fix-submodule-sync-superproject-config' into maintJunio C Hamano2-1/+5
2010-09-01Merge branch 'en/rebase-against-rebase-fix' into maintJunio C Hamano2-0/+71
2010-09-01install-webdoc: filter timestamp-only changes correctlyJunio C Hamano1-1/+1
2010-09-01builtin.h: Move two functions definitions to help.h.Thiago Farina3-11/+13
2010-08-31Merge branch 'np/maint-huge-delta-generation'Junio C Hamano1-1/+8
2010-08-31Merge branch 'da/fix-submodule-sync-superproject-config'Junio C Hamano2-1/+5
2010-08-31Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano6-84/+152
2010-08-31Merge branch 'cb/binary-patch-id'Junio C Hamano1-0/+7
2010-08-31Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'Junio C Hamano1-1/+1
2010-08-31Merge branch 'dj/fetch-tagopt'Junio C Hamano4-7/+56
2010-08-31Merge branch 'en/d-f-conflict-fix'Junio C Hamano8-24/+276
2010-08-31Merge branch 'jn/svn-fe'Junio C Hamano31-13/+2108
2010-08-31Merge branch 'tr/maint-no-unquote-plus'Junio C Hamano2-7/+14
2010-08-31Merge branch 'jn/paginate-fix'Junio C Hamano14-47/+120
2010-08-31Merge branch 'jn/maint-setup-fix'Junio C Hamano4-282/+581
2010-08-31Merge branch 'en/fast-export-fix'Junio C Hamano3-1/+30
2010-08-31Merge branch 'hv/autosquash-config'Junio C Hamano4-8/+47
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano4-11/+41
2010-08-31tests: factor HOME=$(pwd) in test-lib.shMatthieu Moy5-13/+3
2010-08-31test-lib: use subshell instead of cd $new && .. && cd $oldÆvar Arnfjörð Bjarmason1-6/+6
2010-08-31tests: simplify "missing PREREQ" messageJonathan Nieder1-1/+7
2010-08-31t/t0000-basic.sh: Run the passing TODO test inside its own test-libÆvar Arnfjörð Bjarmason1-0/+31
2010-08-31test-lib: Allow overriding of TEST_DIRECTORYÆvar Arnfjörð Bjarmason1-1/+7
2010-08-31test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../Ævar Arnfjörð Bjarmason1-14/+15
2010-08-31test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../Ævar Arnfjörð Bjarmason1-8/+8
2010-08-31test: Introduce $GIT_BUILD_DIRThomas Rast1-0/+1
2010-08-31tests: make test_might_fail fail on missing commandsJonathan Nieder1-0/+3
2010-08-31tests: make test_might_fail more verboseJonathan Nieder1-1/+6
2010-08-31notes: Don't create (empty) commit when removing non-existing notesJohan Herland4-9/+30
2010-08-31Extend documentation of core.askpass and GIT_ASKPASS.Knut Franke2-2/+12
2010-08-31Allow core.askpass to override SSH_ASKPASS.Knut Franke2-4/+2