summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-02-07Merge git://repo.or.cz/git-guiv1.7.0-rc2Junio C Hamano34-2514/+3126
2010-02-07Merge branch 'maint'Junio C Hamano2-18/+26
2010-02-07archive: simplify archive format guessingRené Scharfe2-18/+26
2010-02-06Fix invalid read in quote_c_style_countedJeff King2-2/+21
2010-02-06docs: fix filter-branch example for quoted pathsJeff King1-1/+1
2010-02-06t9501: Re-fix max load testBrian Gernhardt1-9/+2
2010-02-06bash: support the --autosquash option for rebaseBjörn Gustavsson1-0/+1
2010-02-05Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-1/+1
2010-02-05t9501: Skip testing load if we can't detect itBrian Gernhardt1-1/+8
2010-02-05Update draft release notes to 1.7.0Junio C Hamano1-1/+6
2010-02-05Merge branch 'maint'Junio C Hamano1-1/+1
2010-02-05Update git fsck --full short description to mention packsWesley J. Landaker1-1/+1
2010-02-05Merge branch 'jc/maint-limit-note-output' into maintJunio C Hamano8-1/+85
2010-02-05Revert 30816237 and 7e62265Junio C Hamano4-96/+1
2010-02-04git-svn: persistent memoizationAndrew Myrick1-4/+36
2010-02-04fast-import: count --max-pack-size in bytesJunio C Hamano3-12/+17
2010-02-04update git-repack documentation wrt repack.UseDeltaBaseOffsetNicolas Pitre1-9/+9
2010-02-04git-clean: fix the description of the default behaviorMichael J Gruber2-4/+4
2010-02-04fast-import.c: Fix big-file-threshold parsing bugJunio C Hamano1-1/+4
2010-02-03make --max-pack-size argument to 'git pack-object' count in bytesNicolas Pitre6-21/+36
2010-02-03pack-objects: fix pack generation when using pack_size_limitNicolas Pitre1-24/+13
2010-02-03fix multiple issues with t5300Nicolas Pitre1-20/+34
2010-02-03gitweb: Simplify (and fix) chop_strJohn 'Warthog9' Hawley1-4/+0
2010-02-04gitk: Fix copyright symbol in About box messagePaul Mackerras1-1/+1
2010-02-03grep: simplify assignment of ->fixedRené Scharfe1-4/+1
2010-02-02Merge branch 'ms/filter-branch-submodule'Junio C Hamano2-1/+40
2010-02-02Merge branch 'jh/gitweb-caching' (early part)Junio C Hamano6-76/+248
2010-02-02Merge branch 'bw/no-python-autoconf'Junio C Hamano1-3/+14
2010-02-02Merge branch 'sp/fast-import-large-blob'Junio C Hamano5-19/+223
2010-02-02Correct spelling of 'REUC' extensionShawn O. Pearce1-1/+1
2010-02-02git-gui: update french translationEmmanuel Trillaud1-320/+366
2010-02-02git-gui: update Japanese translationNanako Shiraishi1-314/+339
2010-02-01build: make code "-Wpointer-arith" cleanJunio C Hamano2-3/+3
2010-02-01configure: Allow --without-pythonBen Walton1-1/+1
2010-02-01configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAMBen Walton1-2/+13
2010-02-01Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blobJunio C Hamano6-19/+224
2010-02-01fast-import: Stream very large blobs directly to packShawn O. Pearce5-20/+227
2010-02-01git-p4: Fix sync errors due to new server versionPal-Kristian Engstad1-1/+1
2010-02-01Updates for dirty submodules in release notes and user manualJens Lehmann2-5/+27
2010-01-31Update draft release notes to 1.7.0Junio C Hamano1-3/+2
2010-01-31Merge branch 'dm/make-threaded-simplify'Junio C Hamano5-36/+13
2010-01-31Make NO_PTHREADS the sole thread configuration variableDan McGee5-36/+13
2010-01-31RPM packaging: use %global inside %{!?...}Junio C Hamano1-1/+4
2010-01-31mention new shell execution behavior in release notesJeff King1-0/+7
2010-01-31Fix memory leak in submodule.cJens Lehmann1-5/+9
2010-01-31Fix typos in technical documentation.Ralf Wildenhues13-24/+24
2010-01-30gitweb: Add optional extra parameter to die_error, for extended explanationJohn 'Warthog9' Hawley1-1/+7
2010-01-30gitweb: add a "string" variant of print_sort_thJohn 'Warthog9' Hawley1-5/+12
2010-01-30gitweb: add a "string" variant of print_local_timeJohn 'Warthog9' Hawley1-2/+9
2010-01-30gitweb: Check that $site_header etc. are defined before using themJohn 'Warthog9' Hawley1-3/+3
2010-01-30gitweb: Makefile improvementsJohn 'Warthog9' Hawley2-53/+141
2010-01-30gitweb: Load checkingJohn 'Warthog9' Hawley4-6/+72
2010-01-30gitweb: Make running t9501 test with '--debug' reliable and usableJakub Narebski1-5/+3
2010-01-30is_submodule_modified(): fix breakage with external GIT_INDEX_FILEv1.7.0-rc1Junio C Hamano1-2/+5
2010-01-30RPM packaging: don't include foreign-scm-helper bits yetJunio C Hamano1-0/+5
2010-01-30grep: Fix two memory leaksDan McGee1-0/+2
2010-01-30rebase: don't invoke the pager for each commit summaryMarkus Heidelberg1-1/+1
2010-01-29Update draft release notes to 1.7.0Junio C Hamano1-2/+15
2010-01-29Merge branch 'maint'Junio C Hamano1-1/+1
2010-01-29Merge branch 'maint-1.6.5' into maintJunio C Hamano1-1/+1
2010-01-29Implement pthread_cond_broadcast on WindowsJohannes Sixt2-15/+94
2010-01-29If deriving SVN_SSH from GIT_SSH on msys, also add quotesSebastian Schuberth1-0/+1
2010-01-29Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano6-889/+3989
2010-01-29add shebang line to git-mergetool--lib.shJeff King1-0/+1
2010-01-29fix off-by-one allocation errorJeff King1-1/+1
2010-01-29fix memcpy of overlapping areaJeff King1-1/+1
2010-01-29Merge branch 'maint'Shawn O. Pearce1-0/+2
2010-01-29git-gui: fix shortcut for menu "Commit/Revert Changes"Heiko Voigt1-0/+2
2010-01-29gitk: Update German translationChristian Stimming1-309/+432
2010-01-29gitk: Add French translationEmmanuel Trillaud1-0/+1254
2010-01-29gitk: update Italian translationMichele Ballabio1-265/+627
2010-01-29gitk: Update Swedish translationPeter Krefting1-311/+362
2010-01-28git-gui: Quote git path when starting another gui in a submoduleJens Lehmann1-1/+1
2010-01-28Merge branch 'maint'Junio C Hamano1-0/+1
2010-01-28bash: support 'git notes' and its subcommandsSZEDER Gábor1-0/+19
2010-01-28filter-branch: Add tests for submodules in tree-filterMichal Sojka1-0/+39
2010-01-28filter-branch: Fix to allow replacing submodules with another contentMichal Sojka1-1/+1
2010-01-28bash: don't offer remote transport helpers as subcommandsSZEDER Gábor1-0/+1
2010-01-28grep --quiet: finishing touchesJunio C Hamano3-2/+15
2010-01-28reject @{-1} not at beginning of object nameJeff King2-1/+5
2010-01-28fix parsing of @{-1}@{u} combinationJeff King2-4/+24
2010-01-28test combinations of @{} syntaxJeff King1-0/+51
2010-01-28rerere: fix too-short initializationJeff King1-1/+1
2010-01-28git-gui: update Italian translationMichele Ballabio1-299/+323
2010-01-28git-gui: Update Swedish translation (520t0f0u)Peter Krefting1-290/+324
2010-01-28t0101: use absolute dateJeff King1-1/+1
2010-01-28Merge branch 'fk/threaded-grep'Junio C Hamano3-51/+482
2010-01-28Merge branch 'gp/maint-cvsserver'Junio C Hamano1-1/+1
2010-01-28tests: update tests that used to failJunio C Hamano2-2/+2
2010-01-27git-gui: use themed tk widgets with Tk 8.5Pat Thoyts26-453/+697
2010-01-27git-gui: Update German translation (12 new or changed strings).Christian Stimming1-398/+426
2010-01-27Merge branch 'jc/upstream-reflog'Junio C Hamano2-4/+43
2010-01-27Merge branch 'jc/maint-reflog-bad-timestamp'Junio C Hamano4-10/+86
2010-01-27Merge branch 'il/maint-colon-address'Junio C Hamano2-6/+38
2010-01-27Merge branch 'il/maint-xmallocz'Junio C Hamano4-10/+15
2010-01-27Merge branch 'jh/maint-config-file-prefix'Junio C Hamano2-1/+12
2010-01-27transport_get(): drop unnecessary check for !remoteJunio C Hamano1-1/+1
2010-01-27Fix remote.<remote>.vcsIlari Liusvaara1-6/+5
2010-01-27t0101: use a fixed timestamp when searching in the reflogJunio C Hamano1-2/+2
2010-01-27Update @{bogus.timestamp} fix not to die()Junio C Hamano1-2/+2
2010-01-26Merge branch 'jl/diff-submodule-ignore'Junio C Hamano7-8/+85
2010-01-26work around an obnoxious bash "safety feature" on OpenBSDJunio C Hamano1-3/+3
2010-01-26git-gui: Update translation templateShawn O. Pearce1-282/+302
2010-01-26fix portability issues with $ in double quotesStephen Boyd12-52/+52
2010-01-26approxidate_careful() reports errorneous date stringJunio C Hamano4-10/+86
2010-01-26Fix log -g this@{upstream}Junio C Hamano2-4/+43
2010-01-26Fix integer overflow in unpack_compressed_entry()Ilari Liusvaara1-2/+1
2010-01-26Fix integer overflow in unpack_sha1_rest()Ilari Liusvaara1-2/+1
2010-01-26Fix integer overflow in patch_delta()Ilari Liusvaara1-2/+1
2010-01-26Add xmallocz()Ilari Liusvaara2-4/+12
2010-01-26git-cvsserver: allow regex metacharacters in CVSROOTGerrit Pape1-1/+1
2010-01-26builtin-config: Fix crash when using "-f <relative path>" from non-root dirJohan Herland2-1/+12
2010-01-26Allow use of []-wrapped addresses in git://Ilari Liusvaara1-2/+8
2010-01-26Support addresses with ':' in git-daemonIlari Liusvaara1-4/+30
2010-01-26grep: use REG_STARTEND (if available) to speed up regexecBenjamin Kramer1-1/+8
2010-01-26Threaded grepFredrik Kuivinen3-49/+468
2010-01-25am: fix patch format detection for Thunderbird "Save As" emailsStephen Boyd2-1/+17
2010-01-25t0022: replace non-portable literal CRStephen Boyd1-1/+1
2010-01-25tests: consolidate CR removal/addition functionsStephen Boyd6-58/+37
2010-01-25grep: expose "status-only" feature via -qJunio C Hamano1-2/+14
2010-01-25commit-tree: remove unused #defineStephen Boyd1-2/+0
2010-01-25t5541-http-push: make grep expression check for one line onlyTay Ray Chuan1-8/+4
2010-01-25rebase: replace antiquated sed invocationStephen Boyd1-4/+2
2010-01-25Add test-run-command to .gitignoreAlejandro Riveira Fernández1-0/+1
2010-01-25git_connect: use use_shell instead of explicit "sh", "-c"Johannes Sixt1-2/+1
2010-01-25git-gui: Remove unused icon file_parttickShawn O. Pearce1-9/+0
2010-01-25git-gui: use different icon for new and modified files in the indexPeter Oberndorfer1-1/+1
2010-01-24Teach diff --submodule that modified submodule directory is dirtyJens Lehmann4-1/+72
2010-01-24git diff: Don't test submodule dirtiness with --ignore-submodulesJens Lehmann1-4/+6
2010-01-24gitweb.js: Workaround for IE8 bugv1.7.0-rc0Jakub Narebski1-1/+6
2010-01-24Merge branch 'jc/fix-tree-walk'Junio C Hamano19-140/+734
2010-01-24Make test numbers uniqueJohannes Sixt1-0/+0
2010-01-24Merge branch 'maint'Junio C Hamano5-23/+48
2010-01-24Merge branch 'maint' of git://git.spearce.org/git-gui into maintJunio C Hamano5-23/+48
2010-01-24Windows: Remove dependency on pthreadGC2.dllMichael Lukashov1-1/+3
2010-01-24Documentation: move away misplaced 'push --upstream' descriptionThomas Rast1-7/+7
2010-01-24Documentation: add missing :: in config.txtThomas Rast1-1/+1
2010-01-24Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trastJunio C Hamano3-80/+102
2010-01-24pull: re-fix command line generationJunio C Hamano2-1/+36
2010-01-24Documentation: merge: use MERGE_HEAD to refer to the remote branchJonathan Nieder1-6/+8
2010-01-24Documentation: simplify How Merge WorksJonathan Nieder1-36/+16
2010-01-24Documentation: merge: add a section about fast-forwardJonathan Nieder1-13/+18
2010-01-24Documentation: emphasize when git merge terminates earlyJonathan Nieder1-10/+21
2010-01-24Documentation: merge: add an overviewJonathan Nieder1-2/+26
2010-01-24Documentation: merge: move merge strategy list to endJonathan Nieder1-2/+2
2010-01-24Documentation: suggest `reset --merge` in How Merge Works sectionJonathan Nieder1-3/+3
2010-01-24Documentation: merge: move configuration section to endJonathan Nieder1-9/+9
2010-01-24Make ce_uptodate() trustworthy againJunio C Hamano3-3/+7
2010-01-23rebase -i: Export GIT_AUTHOR_* variables explicitlyJunio C Hamano1-4/+4
2010-01-23git-gui: set GIT_DIR and GIT_WORK_TREE after setupGiuseppe Bilotta1-23/+20
2010-01-23git-gui: update shortcut tools to use _gitworktreeGiuseppe Bilotta1-3/+4
2010-01-23git-gui: handle bare repos correctlyGiuseppe Bilotta1-7/+36
2010-01-23git-gui: handle non-standard worktree locationsGiuseppe Bilotta1-9/+28
2010-01-23git-gui: Support applying a range of changes at onceJeff Epler2-104/+153
2010-01-23git-gui: Add a special diff popup menu for submodulesJens Lehmann1-16/+110
2010-01-23git-gui: Use git diff --submodule when availableJens Lehmann1-4/+13
2010-01-23git-gui: work from the .git dirGiuseppe Bilotta1-0/+10
2010-01-23git-gui: Fix applying a line when all following lines are deletionsJeff Epler1-0/+1
2010-01-23git-gui: Correct file_states when unstaging partly staged entryJens Lehmann1-0/+3
2010-01-23git-gui: Fix gitk for branch whose name matches local filePeter Krefting1-1/+1
2010-01-23git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in syncChristopher Beelby1-0/+4
2010-01-23git-gui: handle really long error messages in updateindex.Pat Thoyts1-16/+18
2010-01-23Documentation: rev-list: fix synopsys for --tags and and --remotesChristian Couder1-2/+2
2010-01-23Merge git://git.bogomips.org/git-svnJunio C Hamano9-162/+1018
2010-01-23git-svn: allow subset of branches/tags to be specified in glob specJay Soffian4-20/+320
2010-01-23git-svn: allow UUID to be manually remapped via rewriteUUIDJay Soffian4-8/+140
2010-01-23git-svn: update svn mergeinfo test suiteAndrew Myrick3-127/+485
2010-01-23git-svn: document --username/commit-url for branch/tagIgor Mironov1-0/+13
2010-01-23git-svn: add --username/commit-url options for branch/tagIgor Mironov1-2/+6
2010-01-23git-svn: respect commiturl option for branch/tagIgor Mironov1-1/+11
2010-01-23git-svn: fix mismatched src/dst errors for branch/tagIgor Mironov1-0/+4
2010-01-23git-svn: handle merge-base failuresAndrew Myrick1-4/+15
2010-01-23git-svn: ignore changeless commits when checking for a cherry-pickAndrew Myrick1-0/+24
2010-01-22t7800-difftool.sh: Test mergetool.prompt fallbackDavid Aguilar1-0/+12
2010-01-22msvc: Add a definition of NORETURN compatible with msvc compilerRamsay Jones1-0/+3
2010-01-22Update draft release notes to 1.7.0Junio C Hamano1-1/+26
2010-01-22msvc: Fix a compiler warning due to an incorrect pointer castRamsay Jones1-1/+1
2010-01-22msvc: Fix an "unrecognized option" linker warningRamsay Jones2-0/+2
2010-01-22Merge branch 'maint'Junio C Hamano2-9/+36
2010-01-22Merge branch 'jc/branch-d'Junio C Hamano2-10/+80
2010-01-22Merge branch 'il/rev-glob'Junio C Hamano9-19/+357
2010-01-22Merge branch 'js/refer-upstream'Junio C Hamano3-13/+192
2010-01-22Merge branch 'jl/submodule-diff'Junio C Hamano14-52/+279
2010-01-22Merge branch 'il/remote-updates'Junio C Hamano3-1/+330
2010-01-22Merge branch 'il/branch-set-upstream'Junio C Hamano5-13/+64
2010-01-22Merge branch 'jc/maint-limit-note-output'Junio C Hamano8-1/+85
2010-01-22Merge branch 'nd/ls-files-sparse-fix'Junio C Hamano1-3/+13
2010-01-22Make difftool.prompt fall back to mergetool.promptSebastian Schuberth1-1/+2
2010-01-22engine.pl: Fix a recent breakage of the buildsystem generatorRamsay Jones1-3/+5
2010-01-22ignore duplicated slashes in make_relative_path()Junio C Hamano2-9/+36
2010-01-22git-mv: fix moving more than one source to a single destinationJunio C Hamano2-4/+19
2010-01-22rebase -i: Enclose sed command substitution in quotesMichael Haggerty1-1/+1
2010-01-22rebase -i: Avoid non-portable "test X -a Y"Michael Haggerty1-1/+1
2010-01-22make "index-pack" a built-inLinus Torvalds7-15/+16
2010-01-22make "git pack-redundant" a built-inLinus Torvalds4-7/+5
2010-01-22make "git unpack-file" a built-inLinus Torvalds4-5/+4
2010-01-22make "mktag" a built-inLinus Torvalds4-6/+4
2010-01-22make "merge-index" a built-inLinus Torvalds4-6/+5
2010-01-22merge-tree: remove unnecessary call of git_extract_argv0_pathJohannes Sixt1-2/+0
2010-01-21make "git patch-id" a built-inLinus Torvalds4-4/+4