summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2008-03-23GIT 1.5.5-rc1v1.5.5-rc1Junio C Hamano2-2/+5
2008-03-23gc --auto: raise default auto pack limit from 20 to 50Junio C Hamano2-2/+2
2008-03-23Merge branch 'git-p4' of git://repo.or.cz/git/git-p4Junio C Hamano1-9/+14
2008-03-22remote.c: Fix overtight refspec validationJunio C Hamano5-49/+188
2008-03-22fast-import: Document the effect of "merge" with no "from" in a commitEyvind Bernhardsen1-3/+8
2008-03-22Make git-svn tests behave better on OS XKevin Ballard1-2/+23
2008-03-22Improve description of git filter-branch.Ralf Wildenhues1-11/+12
2008-03-22t/t7003-filter-branch.sh: use test_must_fail rather than '!'Brandon Casey1-6/+6
2008-03-20Don't try and percent-escape existing percent escapes in git-svn URIsKevin Ballard2-1/+32
2008-03-19remote show: do not show symbolic refsJohannes Schindelin2-1/+14
2008-03-19Document the sendemail.smtpserverport config variableKevin Ballard1-0/+3
2008-03-19Add --reverse to the git-rev-list usage stringKevin Ballard1-0/+1
2008-03-19make it easier for people who just want to get rid of 'git gc --auto'Nicolas Pitre1-2/+9
2008-03-19builtin-gc.c: allow disabling all auto-gc'ing by assigning 0 to gc.autoBrandon Casey1-3/+3
2008-03-19Documentation/git-merge: document subtree strategy.Miklos Vajna1-0/+7
2008-03-19Fix tag followingDaniel Barkalow1-0/+16
2008-03-19Make revision limiting more robust against occasional bad commit datesLinus Torvalds2-11/+39
2008-03-18Fix t3200 configDaniel Barkalow1-10/+10
2008-03-18Tighten refspec processingDaniel Barkalow1-9/+38
2008-03-18Fix possible Solaris problem in 'checkout_entry()'Linus Torvalds1-2/+2
2008-03-18Fix read-tree not to discard errorsJunio C Hamano2-4/+7
2008-03-18Add tests to catch problems with un-unlinkable symlinksJunio C Hamano1-0/+35
2008-03-18Test: catch if trash cannot be removedJunio C Hamano1-1/+6
2008-03-18git-merge-one-file: fix longstanding stupid thinkoJunio C Hamano2-2/+49
2008-03-17Merge branch 'jc/makefile'Junio C Hamano1-150/+276
2008-03-16Don't update unchanged merge entriesLinus Torvalds2-3/+47
2008-03-16fast-import: Allow "reset" to delete a new branch without errorEyvind Bernhardsen1-0/+2
2008-03-16t1000: use "test_must_fail git frotz", not "! git frotz"Junio C Hamano1-18/+18
2008-03-16Update draft release notes for 1.5.5v1.5.5-rc0Junio C Hamano1-9/+42
2008-03-16Resurrect git-rerere to contrib/examplesJunio C Hamano1-0/+284
2008-03-16Merge branch 'maint'Junio C Hamano2-1/+54
2008-03-16Start draft ReleaseNotes for 1.5.4.5Junio C Hamano2-1/+54
2008-03-16rebase -m: do not trigger pre-commit verificationJunio C Hamano1-1/+1
2008-03-15Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano12-2431/+3155
2008-03-16git-gui: Improve directions regarding POT update in po/READMEJunio C Hamano1-12/+50
2008-03-15git-gui: Update Japanese translationしらいしななこ1-13/+9
2008-03-15Redo "add test_cmp function for test scripts"Junio C Hamano2-2/+2
2008-03-15Merge branch 'jk/portable'Junio C Hamano70-202/+247
2008-03-15Merge branch 'py/submodule'Junio C Hamano3-8/+386
2008-03-15Merge branch 'db/diff-to-fp'Junio C Hamano3-155/+171
2008-03-15Merge branch 'cc/help'Junio C Hamano3-11/+168
2008-03-15shortlog: do not require to run from inside a git repositoryJonas Fonseca3-2/+9
2008-03-15Merge branch 'maint'Junio C Hamano7-22/+71
2008-03-15format-patch: generate MIME header as needed even when there is format.headerJunio C Hamano5-16/+57
2008-03-15Merge branch 'maint'Junio C Hamano4-16/+23
2008-03-15Make man page building quiet when DOCBOOK_XSL_172 is definedJonas Fonseca1-1/+5
2008-03-15git-new-workdir: Share SVN meta data between work dirs and the repositoryBernt Hansen1-1/+1
2008-03-14Fix recent 'unpack_trees()'-related changes breaking 'git stash'Linus Torvalds1-0/+2
2008-03-15git-gui: Adjusted Japanese translation to updated POTShawn O. Pearce1-249/+277
2008-03-15git-gui: Update Japanese translationしらいしななこ1-291/+266
2008-03-15git-gui: Don't translate the special Apple menuShawn O. Pearce2-2/+2
2008-03-15git-gui: Updated Hungarian translation (e5fba18)Miklos Vajna1-14/+9
2008-03-15git-gui: update russian translationAlex Riesen1-27/+21
2008-03-15git-gui: remove spurious "fuzzy" attributes in po/it.poMichele Ballabio1-2/+0
2008-03-14rev-parse: fix meaning of rev~ vs rev~0.Linus Torvalds1-13/+15
2008-03-14git-svn: don't blindly append '*' to branch/tags configEric Wong1-1/+2
2008-03-14t6000lib: re-fix tr portabilityJeff King1-4/+7
2008-03-14Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano3-26/+980
2008-03-14gitk: initial Italian translationMichele Ballabio1-0/+890
2008-03-14gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -dPaul Mackerras1-0/+4
2008-03-14wt-status.c: no need for dup() dance anymoreKristian Høgsberg1-15/+2
2008-03-14Write diff output to a file in struct diff_optionsDaniel Barkalow2-140/+169
2008-03-14Documention: web--browse: add info about "browser.<tool>.cmd" config varChristian Couder2-0/+26
2008-03-14web--browse: use custom commands defined at config timeChristian Couder1-2/+13
2008-03-14Merge branch 'mr/autoconf-fread'Junio C Hamano2-0/+21
2008-03-14Merge branch 'maint'Junio C Hamano7-18/+95
2008-03-14Merge branch 'ph/maint-quiltimport' into maintJunio C Hamano1-3/+19
2008-03-13read-tree() and unpack_trees(): use consistent limitJunio C Hamano3-8/+9
2008-03-13merge-file: handle empty files gracefullyJohannes Schindelin2-3/+4
2008-03-13merge-recursive: handle file mode changesClemens Buchacher2-2/+62
2008-03-14git-gui: updated Swedish translationPeter Karlsson1-290/+375
2008-03-14git-gui: Regenerated po template and merged translations with itPeter Karlsson8-1841/+2311
2008-03-13pack-objects: proper pack time stamping with --max-pack-sizeNicolas Pitre2-0/+27
2008-03-13Minor wording changes in the keyboard descriptions in git-add --interactive.Vineet Kumar1-10/+8
2008-03-13Documentation/git-help: typofixJunio C Hamano1-1/+1
2008-03-13Update Hungarian translation. 100% completed.Miklos Vajna1-38/+102
2008-03-13t7505: use SHELL_PATH in hookJeff King1-2/+3
2008-03-13t9112: add missing #!/bin/sh headerJeff King1-0/+2
2008-03-13filter-branch: use $SHELL_PATH instead of 'sh'Jeff King2-1/+2
2008-03-13filter-branch: don't use xargs -0Jeff King1-1/+1
2008-03-13add NO_EXTERNAL_GREP build optionJeff King2-2/+16
2008-03-13t6000lib: tr portability fixJeff King1-1/+4
2008-03-13t4020: don't use grep -aJeff King2-1/+2
2008-03-13add test_cmp function for test scriptsJeff King40-115/+133
2008-03-13remove use of "tail -n 1" and "tail -1"Jeff King7-20/+20
2008-03-13grep portability fix: don't use "-e" or "-q"Jeff King9-43/+42
2008-03-13more tr portability test script fixesJeff King10-17/+17
2008-03-13t0050: perl portability fixJeff King1-2/+2
2008-03-13git-p4: Use P4EDITOR environment variable when setShawn Bohrer1-1/+4
2008-03-13git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'Shawn Bohrer1-0/+2
2008-03-13git-p4: Optimize the fetching of data from perforce.Marius Storm-Olsen1-8/+8
2008-03-13git fetch: Take '-n' to mean '--no-tags'Johannes Schindelin1-0/+2
2008-03-12Merge branch 'maint'Junio C Hamano1-1/+1
2008-03-12gc: call "prune --expire 2.weeks.ago" by defaultJohannes Schindelin5-32/+73
2008-03-12Documentation/config: typofixJunio C Hamano1-1/+1
2008-03-12help: warn if specified 'man.viewer' is unsupported, instead of erroring outChristian Couder1-1/+1
2008-03-12Documentation: help: explain 'man.viewer' multiple valuesChristian Couder2-2/+29
2008-03-13git-gui: update Italian translationMichele Ballabio1-265/+346
2008-03-12tr portability fixesJeff King4-6/+9
2008-03-12quiltimport: fix misquoting of parsed -p<num> parameterJunio C Hamano1-2/+2
2008-03-12git-cvsimport: fix merging with remote parent branchMarc-Andre Lureau1-1/+1
2008-03-12gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' formJakub Narebski1-2/+2
2008-03-12Makefile: flatten enumeration of headers, objects and programsJunio C Hamano1-148/+276
2008-03-12Makefile: DIFF_OBJS is not special at all these daysJunio C Hamano1-7/+5
2008-03-12git-submodule summary: fix that some "wc" flavors produce leading spacesJohannes Sixt1-1/+1
2008-03-11git-submodule summary: testPing Yin1-0/+195
2008-03-11git-submodule summary: documentationPing Yin1-3/+16
2008-03-11git-submodule summary: limit summary sizePing Yin1-2/+19
2008-03-11git-submodule summary: show commit summaryPing Yin1-0/+102
2008-03-11help: implement multi-valued "man.viewer" config optionChristian Couder1-78/+113
2008-03-11Documentation: help: describe 'man.viewer' config variableChristian Couder2-10/+26
2008-03-11help: add "man.viewer" config var to use "woman" or "konqueror"Christian Couder1-1/+80
2008-03-11Merge git://repo.or.cz/git-guiJunio C Hamano9-573/+724
2008-03-12git-gui: Simplify MSGFMT setting in MakefileJunio C Hamano1-6/+1
2008-03-11Merge branch 'js/remote'Junio C Hamano12-3/+795
2008-03-11Merge branch 'lt/unpack-trees'Junio C Hamano15-452/+503
2008-03-11"remote update": print remote name being fetched fromSamuel Tardieu1-0/+1
2008-03-11Merge branch 'maint'Junio C Hamano4-3/+37
2008-03-11git-svn: fix find-rev error message when missing argMarc-Andre Lureau1-1/+2
2008-03-11t0021: tr portability fix for SolarisJeff King1-1/+3
2008-03-11git-submodule summary: code frameworkPing Yin1-5/+56
2008-03-11launch_editor(): allow spaces in the filenameJohannes Schindelin2-1/+32
2008-03-11git rebase --abort: always restore the right commitMike Hommey2-3/+73
2008-03-11gitk: Avoid Tcl error when switching viewsPaul Mackerras1-3/+1
2008-03-11[PATCH] gitk: Don't show local changes when we there is no work treeDavid Aguilar1-1/+6
2008-03-11autoconf: Test FREAD_READS_DIRECTORIESMichal Rokos2-0/+21
2008-03-11Merge branch 'jc/cherry-pick' (early part)Junio C Hamano6-389/+449
2008-03-11Merge branch 'maint'Junio C Hamano1-0/+2
2008-03-11Merge branch 'kb/maint-filter-branch-disappear' into maintJunio C Hamano2-1/+34
2008-03-11Merge branch 'aw/maint-shortlog-blank-lines' into maintJunio C Hamano1-2/+3
2008-03-10unpack_trees(): fix diff-index regression.Linus Torvalds2-2/+18
2008-03-10update 'git rebase' documentationSZEDER Gábor2-4/+2
2008-03-10bash: fix long option with argument double completionSZEDER Gábor1-7/+15
2008-03-10bash: Add more long options to be completed with "git --<TAB>"Teemu Likonen1-0/+3
2008-03-10bash: use __gitdir when completing 'git rebase' optionsSZEDER Gábor1-2/+2
2008-03-10bash: Remove completion of core.legacyheaders optionShawn O. Pearce1-1/+0
2008-03-10bash: add 'git svn' subcommands and optionsSZEDER Gábor1-1/+80
2008-03-10bash: add new 'git stash' subcommandsSZEDER Gábor1-1/+1
2008-03-10bash: refactor searching for subcommands on the command lineSZEDER Gábor1-39/+32
2008-03-10bash: remove unnecessary conditions when checking for subcommandsSZEDER Gábor1-4/+4
2008-03-10bash: Properly quote the GIT_DIR at all times to fix subdirectory paths with ...Kevin Ballard1-4/+4
2008-03-10traverse_trees_recursive(): propagate merge errors upJunio C Hamano1-3/+4
2008-03-10git-pull documentation: warn about the option orderJunio C Hamano1-0/+2
2008-03-09git-quiltimport: better parser to grok "enhanced" series files.Pierre Habouzit1-3/+19
2008-03-10[PATCH] gitk: Add horizontal scrollbar to the diff viewPekka Kaitaniemi1-6/+14
2008-03-10[PATCH] gitk: make autoselect optionalJeff King1-3/+14
2008-03-10[PATCH] gitk: Mark another string for translationMichele Ballabio1-1/+1
2008-03-10[PATCH] Add an --argscmd flag to get the list of refs to showYann Dirson1-10/+40
2008-03-10gitk: Only restore window size from ~/.gitk, not positionPaul Mackerras1-2/+10
2008-03-09unpack_trees(): minor memory leak fix in unused destination indexLinus Torvalds1-0/+1
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds8-153/+102
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds7-39/+52
2008-03-09Add 'const' where appropriate to index handling functionsLinus Torvalds4-16/+16
2008-03-09Fix tree-walking compare_entry() in the presense of --prefixLinus Torvalds1-0/+3
2008-03-09Move 'unpack_trees()' over to 'traverse_trees()' interfaceLinus Torvalds1-281/+249
2008-03-09Make 'traverse_trees()' traverse conflicting DF entries in parallelLinus Torvalds3-4/+9
2008-03-09Add return value to 'traverse_tree()' callbackLinus Torvalds3-13/+22
2008-03-09Make 'traverse_tree()' use linked structure rather than 'const char *base'Linus Torvalds3-28/+78
2008-03-09Add 'df_name_compare()' helper functionLinus Torvalds2-0/+36
2008-03-08builtin remote rm: remove symbolic refs, tooJohannes Schindelin2-0/+6
2008-03-08Add a test for read-tree -u --reset with a D/F conflictJeff King1-0/+30
2008-03-08Merge branch 'ph/parseopt'Junio C Hamano6-23/+68
2008-03-08Merge branch 'dp/clean-fix'Junio C Hamano11-94/+123
2008-03-08Merge branch 'ml/submodule-add-existing'Junio C Hamano2-22/+33
2008-03-08Merge branch 'mr/compat-snprintf'Junio C Hamano5-0/+92
2008-03-08Merge branch 'sp/fetch-optim'Junio C Hamano11-24/+338
2008-03-08Merge branch 'jc/describe-always'Junio C Hamano2-32/+44
2008-03-08Merge branch 'jc/am'Junio C Hamano5-16/+118
2008-03-08Merge branch 'cr/reset-parseopt'Junio C Hamano1-27/+20
2008-03-08Merge branch 'jn/gitweb-pickaxe'Junio C Hamano1-42/+43
2008-03-08Merge branch 'kb/maint-filter-branch-disappear'Junio C Hamano2-1/+34
2008-03-08Merge branch 'maint' to sync with 1.5.4.4Junio C Hamano7-14/+39
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-08filter-branch: handle "disappearing tree" case correctly in subdir filterJunio C Hamano2-1/+34
2008-03-08merge-tool documentation: describe custom command usageCharles Bailey1-0/+22
2008-03-08git-mergetool documentaiton: show toolnames in typewriter fontCharles Bailey1-8/+8
2008-03-08Really make the LF after reset in fast-import optionalAdeodato Simó2-1/+4
2008-03-08Merge branch 'aw/maint-shortlog-blank-lines'Junio C Hamano1-2/+3
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-07Merge branch 'maint'Junio C Hamano4-12/+27
2008-03-07send-email: --no-signed-off-cc should suppress 'sob' ccJunio C Hamano1-1/+2
2008-03-07Merge branch 'js/reflog-delete'Junio C Hamano8-7/+245
2008-03-07Merge branch 'dc/format-pretty'Junio C Hamano8-9/+21
2008-03-07Merge branch 'cb/mergetool'Junio C Hamano3-76/+162
2008-03-07git-clean: add tests for relative pathJunio C Hamano1-0/+52
2008-03-07git-clean: correct printing relative pathDmitry Potapov1-18/+14
2008-03-07Make private quote_path() in wt-status.c available as quote_path_relative()Dmitry Potapov3-45/+48
2008-03-07git-gui: Add option for changing the width of the commit message text boxAdam Piątyszek2-1/+3
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-07Merge branch 'ar/sgid-bsd'Junio C Hamano3-1/+11
2008-03-07Merge branch 'cc/run-command'Junio C Hamano2-10/+11
2008-03-07Revert part of d089eba (setup: sanitize absolute and funny paths in get_paths...Junio C Hamano1-10/+1
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-18 22:34:23 +0000