summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2008-03-08GIT 1.5.4.4v1.5.4.4Junio C Hamano2-7/+27
2008-03-08ident.c: reword error message when the user name cannot be determinedSanti Béjar1-1/+1
2008-03-08Fix dcommit, rebase when rewriteRoot is in useJohn Goerzen1-1/+6
2008-03-08Really make the LF after reset in fast-import optionalAdeodato Simó2-1/+4
2008-03-08Merge branch 'mh/maint-http-proxy-fix' into maintJunio C Hamano7-12/+22
2008-03-08Merge branch 'js/maint-daemon' into maintJunio C Hamano1-5/+13
2008-03-08Merge branch 'js/maint-cvsexport' into maintJunio C Hamano2-8/+67
2008-03-08Merge branch 'jc/maint-log-merge-left-right' into maintJunio C Hamano1-8/+4
2008-03-08Merge branch 'ew/maint-svn-cert-fileprovider' into maintJunio C Hamano1-0/+1
2008-03-07unquote_c_style: fix off-by-one.Pierre Habouzit1-1/+1
2008-03-07test-lib: fix TERM to dumb for test repeatabilityJunio C Hamano1-7/+17
2008-03-07config.txt: refer to --upload-pack and --receive-pack instead of --execUwe Kleine-König1-4/+4
2008-03-06Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano1-0/+5
2008-03-05git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl failsShawn O. Pearce1-0/+5
2008-03-03Fix 'git remote show' regression on empty repository in 1.5.4Shawn O. Pearce1-4/+0
2008-03-03Fix incorrect wording in git-merge.txt.Matthieu Moy1-1/+2
2008-03-03git-merge.sh: better handling of combined --squash,--no-ff,--no-commit optionsGerrit Pape2-6/+17
2008-03-03Fix random crashes in http_cleanup()Mike Hommey1-11/+3
2008-03-02Update draft release notes for 1.5.4.4Junio C Hamano1-1/+21
2008-03-02revert: actually check for a dirty indexJeff King2-4/+25
2008-03-02tests: introduce test_must_failJunio C Hamano2-8/+25
2008-03-02git-submodule: Fix typo 'url' which should be '$url'Ping Yin1-1/+1
2008-03-02receive-pack: Initialize PATH to include exec-dir.Björn Steinbrink1-0/+2
2008-02-29Documentation cherry-pick: Fix cut-and-paste errorMike Ralphson1-1/+1
2008-02-29git.el: find the git-status buffer whatever its name isRémi Vanicat1-1/+1
2008-02-29Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano1-1/+1
2008-02-28templates/Makefile: don't depend on local umask settingGerrit Pape1-3/+3
2008-02-28Correct name of diff_flush() in API documentationDaniel Barkalow1-1/+1
2008-02-27Start preparing for 1.5.4.4Junio C Hamano2-1/+27
2008-02-28git-gui: Paper bag fix info dialog when no files are staged at commitgitgui-0.9.3Shawn O. Pearce1-1/+1
2008-02-27Fix "git log --merge --left-right"Junio C Hamano1-8/+4
2008-02-27Set proxy override with http_init()Mike Hommey7-12/+22
2008-02-27daemon: ensure that base-path is an existing directoryJohannes Sixt1-0/+8
2008-02-27daemon: send more error messages to the syslogJohannes Sixt1-5/+5
2008-02-27Eliminate confusing "won't bisect on seeked tree" failureCarl Worth2-6/+10
2008-02-27builtin-reflog.c: don't install new reflog on write failureBrandon Casey1-2/+3
2008-02-27send-email: fix In-Reply-To regressionJay Soffian2-3/+27
2008-02-27git-svn: Don't prompt for client cert password everytime.Sebastian Noack1-0/+1
2008-02-27Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIRJohan Herland2-7/+6
2008-02-27Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIRJohan Herland1-1/+17
2008-02-27Prompt to continue when editing during rebase --interactiveJonathan del Strother1-0/+4
2008-02-27Documentation/git svn log: add a note about timezones.Miklos Vajna1-0/+4
2008-02-27Merge branch 'js/maint-http-push' into maintJunio C Hamano1-9/+18
2008-02-27Don't use GIT_CONFIG in t5505-remoteDaniel Barkalow1-3/+0
2008-02-25Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotestBryan Donlan1-1/+1
2008-02-25timezone_names[]: fixed the tz offset for New Zealand.Steven Drake1-3/+3
2008-02-25filter-branch documentation: non-zero exit status in command abort the filterCaio Marcelo de Oliveira Filho1-2/+4
2008-02-25rev-parse: fix potential bus error with --parseopt option spec handlingJay Soffian2-1/+44
2008-02-25Use a single implementation and API for copy_file()Daniel Barkalow5-43/+27
2008-02-25Documentation/git-filter-branch: add a new msg-filter exampleMiklos Vajna1-0/+9
2008-02-24Correct fast-export file mode strings to match fast-import standardShawn O. Pearce1-1/+1
2008-02-24Protect peel_ref fallback case from NULL parse_object resultShawn O. Pearce1-1/+1
2008-02-24Ensure 'make dist' compiles git-archive.exe on CygwinShawn O. Pearce1-1/+1
2008-02-23GIT 1.5.4.3v1.5.4.3Junio C Hamano3-3/+31
2008-02-23Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano5-15/+50
2008-02-22hash: fix lookup_hash semanticsJeff King1-1/+1
2008-02-22git-gui: Focus insertion point at end of strings in repository chooserShawn O. Pearce1-0/+4
2008-02-22git-gui: Avoid hardcoded Windows paths in Cygwin package filesShawn O. Pearce1-1/+11
2008-02-22git-gui: Default TCL_PATH to same location as TCLTK_PATHShawn O. Pearce1-1/+5
2008-02-22git-gui: Paper bag fix error dialogs opening over the main windowShawn O. Pearce1-1/+5
2008-02-20git-gui: Ensure error dialogs always appear over all other windowsShawn O. Pearce1-7/+11
2008-02-20Clarified the meaning of git-add -u in the documentationPekka Kaitaniemi1-2/+2
2008-02-20git-clone.sh: properly configure remote even if remote's head is danglingGerrit Pape2-5/+21
2008-02-20Documentation/git-stash: document options for git stash listMiklos Vajna1-1/+4
2008-02-20send-email: squelch warning due to comparing undefined $_ to ""Jay Soffian1-1/+1
2008-02-19cvsexportcommit: be graceful when "cvs status" reorders the argumentsJohannes Schindelin2-8/+67
2008-02-19Rename git-core rpm to just git and rename the meta-pacakge to git-all.Kristian Høgsberg1-30/+39
2008-02-19push: document the status outputJeff King1-0/+49
2008-02-19Documentation/push: clarify matching refspec behaviorJeff King1-3/+3
2008-02-19push: indicate partialness of error messageJeff King1-1/+1
2008-02-19git-gui: relax "dirty" version detectionWincent Colaiuta1-1/+1
2008-02-17GIT 1.5.4.2v1.5.4.2Junio C Hamano5-11/+65
2008-02-16Documentation/git-reset: Add an example of resetting selected pathsPieter de Bie1-0/+17
2008-02-16Documentation/git-reset: don't mention --mixed for selected-paths resetPieter de Bie1-2/+2
2008-02-16Documentation/git-reset:Junio C Hamano1-1/+1
2008-02-16commit: discard index after setting up partial commitJeff King2-0/+25
2008-02-15filter-branch: handle filenames that need quotingJunio C Hamano2-4/+19
2008-02-15http-push: avoid a needless gotoJohannes Schindelin1-4/+1
2008-02-15http-push: do not get confused by submodulesJohannes Schindelin1-4/+11
2008-02-15http-push: avoid invalid memory accessesJohannes Schindelin1-1/+6
2008-02-15diff: Fix miscounting of --check outputJunio C Hamano2-2/+11
2008-02-15hg-to-git: fix parent analysisStelian Pop1-1/+1
2008-02-15mailinfo: feed only one line to handle_filter() for QP inputJay Soffian6-1/+45
2008-02-15diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"Christian Couder1-5/+2
2008-02-15Add "const" qualifier to "char *excludes_file".Christian Couder3-8/+4
2008-02-15Add "const" qualifier to "char *editor_program".Christian Couder3-8/+4
2008-02-15Add "const" qualifier to "char *pager_program".Christian Couder3-8/+4
2008-02-15config: add 'git_config_string' to refactor string config variables.Christian Couder2-13/+13
2008-02-15diff.c: remove useless check for value != NULLChristian Couder1-7/+2
2008-02-15fast-import: check return value from unpack_entry()Shawn O. Pearce1-0/+2
2008-02-15Validate nicknames of remote branches to prohibit confusing onesDaniel Barkalow1-1/+11
2008-02-15diff.c: replace a 'strdup' with 'xstrdup'.Christian Couder1-1/+1
2008-02-15diff.c: fixup garding of config parser from value=NULLJunio C Hamano1-1/+1
2008-02-13config: add test cases for empty value and no value config variables.Christian Couder1-0/+23
2008-02-13cvsimport: have default merge regex also match beginning of commit messageGerrit Pape1-1/+1
2008-02-13git clone -s documentation: force a new paragraph for the NOTEMiklos Vajna1-6/+7
2008-02-13status: suggest "git rm --cached" to unstage for initial commitJeff King2-2/+11
2008-02-13Protect get_author_ident_from_commit() from filenames in work treeJunio C Hamano2-1/+23
2008-02-13upload-pack: Initialize the exec-path.Johannes Sixt1-0/+3
2008-02-13bisect: use verbatim commit subject in the bisect logJohannes Schindelin1-1/+1
2008-02-13git-cvsimport.txt: fix '-M' description.Sergei Organov1-2/+2
2008-02-12Revert "pack-objects: only throw away data during memory pressure"Junio C Hamano1-11/+2
2008-02-12git-gui: support Git Gui.app under OS X 10.5Jay Soffian2-5/+14
2008-02-11config.c: guard config parser from value=NULLJunio C Hamano1-1/+15
2008-02-11builtin-log.c: guard config parser from value=NULLJunio C Hamano1-3/+2
2008-02-11imap-send.c: guard config parser from value=NULLJunio C Hamano1-0/+4
2008-02-11wt-status.c: guard config parser from value=NULLJunio C Hamano1-0/+2
2008-02-11setup.c: guard config parser from value=NULLJunio C Hamano1-0/+2
2008-02-11remote.c: guard config parser from value=NULLJunio C Hamano1-3/+6
2008-02-11merge-recursive.c: guard config parser from value=NULLJunio C Hamano1-5/+6
2008-02-11http.c: guard config parser from value=NULLJunio C Hamano1-10/+15
2008-02-11help.c: guard config parser from value=NULLJunio C Hamano1-0/+2
2008-02-11git.c: guard config parser from value=NULLJunio C Hamano1-0/+2
2008-02-11diff.c: guard config parser from value=NULLJunio C Hamano1-2/+12
2008-02-11convert.c: guard config parser from value=NULLJunio C Hamano1-2/+2
2008-02-11connect.c: guard config parser from value=NULLJunio C Hamano1-0/+2
2008-02-11builtin-tag.c: guard config parser from value=NULLJunio C Hamano1-1/+1
2008-02-11builtin-show-branch.c: guard config parser from value=NULLJunio C Hamano1-0/+2
2008-02-11builtin-reflog.c: guard config parser from value=NULLJunio C Hamano1-5/+11
2008-02-11builtin-log.c: guard config parser from value=NULLJunio C Hamano1-1/+1
2008-02-11builtin-config.c: guard config parser from value=NULLJunio C Hamano1-0/+2
2008-02-11builtin-commit.c: guard config parser from value=NULLJunio C Hamano1-0/+2
2008-02-11builtin-branch.c: guard config parser from value=NULLJunio C Hamano1-3/+6
2008-02-11builtin-apply.c: guard config parser from value=NULLJunio C Hamano1-0/+2
2008-02-11Add config_error_nonbool() helper functionJunio C Hamano2-0/+10
2008-02-11builtin-gc.c: guard config parser from value=NULLMiklos Vajna1-1/+1
2008-02-11archive-tar.c: guard config parser from value=NULLJunio C Hamano1-1/+1
2008-02-11Work around curl-gnutls not liking to be reinitializedMike Hommey1-4/+3
2008-02-11man pages are littered with .ft C and othersJonas Fonseca2-1/+20
2008-02-11Add a BuildRequires for gettext in the spec file.James Bowes1-1/+4
2008-02-11pack-objects: only throw away data during memory pressureMartin Koegler1-2/+11
2008-02-11builtin-commit: remove .git/SQUASH_MSG upon successful commitGerrit Pape1-0/+1
2008-02-11Make git prune remove temporary packs that look like write failuresDavid Steven Tweed2-0/+71
2008-02-11rebase -i: accept -m as advertised in the man pageUwe Kleine-K,Av(Bnig1-1/+1
2008-02-11Document that the default of branch.autosetupmerge is trueJohannes Schindelin3-11/+13
2008-02-11bisect: allow starting with a detached HEADJohannes Schindelin2-2/+18
2008-02-11git-pull documentation: fix markupJunio C Hamano1-5/+5
2008-02-10config: Fix --unset for continuation linesFrank Lichtenheld2-0/+24
2008-02-09Fix typo in 'blame' documentation.v1.5.4.1Tim Stoakes1-1/+1
2008-02-07gitattributes: fix relative path matchingJunio C Hamano2-3/+52
2008-02-06Fix parsing numeric color valuesTimo Hirvonen2-1/+70
2008-02-05INSTALL: git-merge no longer uses cpioGerrit Pape1-2/+2
2008-02-03git-remote documentation: fix synopsis to match descriptionJörg Sommer1-1/+1
2008-02-03git-am: fix type in its usage stringJörg Sommer1-1/+1
2008-02-03Fix "git-commit -C $tag"Junio C Hamano2-1/+19
2008-02-03Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)Jari Aalto1-3/+4
2008-02-01Update stale documentation links from the main documentation.Junio C Hamano1-0/+5
2008-02-01GIT 1.5.4v1.5.4Junio C Hamano2-12/+6
2008-02-01Fix "git checkout -b foo ':/substring'"Junio C Hamano1-3/+4
2008-01-31Fix typo in a comment in t/test-lib.shMichele Ballabio1-1/+1
2008-01-31git rev-parse manpage: spelling fixMiklos Vajna1-2/+2
2008-01-31Revert "filter-branch docs: remove brackets so not to imply revision arg is o...Junio C Hamano2-2/+2
2008-01-30Documentation/git-cvsserver: Fix typoJean-Luc Herren1-1/+1
2008-01-30filter-branch: assume HEAD if no revision suppliedBrandon Casey1-2/+1
2008-01-30filter-branch docs: remove brackets so not to imply revision arg is optionalBrandon Casey2-2/+2
2008-01-30Use 'printf %s $x' notation in t5401Shawn O. Pearce1-4/+4
2008-01-30filter-branch.sh: remove temporary directory on failureBrandon Casey1-0/+5
2008-01-30git-relink: avoid hard linking in objects/info directoryBrandon Casey1-1/+1
2008-01-29gitweb: Make use of the $git_dir variable at sub git_get_project_descriptionBruno Ribas1-1/+1
2008-01-29gitweb: Add info about $projectroot and $projects_list to gitweb/READMEJakub Narebski1-2/+15
2008-01-29fix doc typosJim Meyering5-8/+8
2008-01-29reflog-expire: Avoid creating new files in a directory inside readdir(3) loopJunio C Hamano1-2/+38
2008-01-29gitweb: Convert generated contents to utf8 in commitdiff_plainYasushi SHOJI1-6/+5
2008-01-29instaweb: use 'browser.<tool>.path' config option if it's set.Christian Couder2-2/+11
2008-01-29Documentation: help: specify supported html browsers.Christian Couder1-0/+10
2008-01-29Documentation: config: add "browser.<tool>.path".Christian Couder1-0/+4
2008-01-28Add test for rebase -i with commits that do not pass pre-commitJohannes Schindelin1-0/+16
2008-01-28t9001: add missing && operatorsJeff King1-4/+4
2008-01-26GIT 1.5.4-rc5v1.5.4-rc5Junio C Hamano2-13/+14
2008-01-26pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin3-2/+33
2008-01-26cvsserver: Fix for histories with multiple rootsSteffen Prohaska2-2/+17
2008-01-26t9400-git-cvsserver-server: Wrap setup into test caseSteffen Prohaska1-3/+4
2008-01-26Documentation: add a bit about sendemail.to configurationMike Hommey1-0/+2
2008-01-26parse-options: catch likely typo in presense of aggregated options.Pierre Habouzit3-2/+40
2008-01-26Add a missing dependency on http.hMike Hommey1-1/+1
2008-01-25git pull manpage: don't include -n from fetch-options.txtMiklos Vajna2-4/+9
2008-01-25git-svn(1): update instructions for resuming a git-svn cloneSam Vilain1-4/+7
2008-01-25autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>.Jakub Narebski2-0/+7
2008-01-24Makefile: customization for supporting HP-UXRobert Schiele1-0/+11
2008-01-24pre-POSIX.1-2001 systems do not have <sys/select.h>Robert Schiele2-0/+7
2008-01-23Merge git://repo.or.cz/git-guiJunio C Hamano3-5/+28
2008-01-23git-commit: exit non-zero if we fail to commit the indexBrandon Casey1-4/+11
2008-01-23git-clone -s: document problems with git gc --pruneMiklos Vajna1-0/+8
2008-01-22git-gui: Correctly cleanup msgfmt '1 message untranslated' outputgitgui-0.9.2Shawn O. Pearce1-1/+1
2008-01-22git-gui: Make the statistics of po2msg match those of msgfmtShawn O. Pearce1-3/+22
2008-01-22git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't availableShawn O. Pearce1-0/+3
2008-01-22git-gui: Work around random missing scrollbar in revision listShawn O. Pearce1-1/+2
2008-01-22git-svn: default to repacking every 1000 commitsEric Wong1-6/+4
2008-01-22Clarify that http-push being temporarily disabled with older cURLJunio C Hamano3-2/+23
2008-01-21pack-objects: Fix segfault when object count is less than thread countNicolas Pitre1-1/+2
2008-01-21Make t5710 more strict when creating nested reposAlex Riesen1-4/+8
2008-01-21send-email, fix breakage in combination with --composeGustaf Hendeby1-1/+1
2008-01-21Document the hairy gfi_unpack_entry part of fast-importShawn O. Pearce1-0/+33
2008-01-21Teach fast-import to honor pack.compression and pack.depthShawn O. Pearce1-3/+29
2008-01-21submodule: Document the details of the command line syntaxSteffen Prohaska1-2/+3
2008-01-20git-submodule: add test for the subcommand parser fixJunio C Hamano1-28/+28
2008-01-20git-submodule: fix subcommand parserJunio C Hamano1-41/+116
2008-01-20git-submodule: rename shell functions for consistencyJunio C Hamano1-10/+10
2008-01-20Merge git://repo.or.cz/git-guiJunio C Hamano4-76/+145
2008-01-20git-gui: Correct encoding of glossary/fr.po to UTF-8Shawn O. Pearce1-13/+13