summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-02-28Git 1.7.0.1v1.7.0.1Junio C Hamano3-7/+12
2010-02-28Remove reference to GREP_COLORS from documentationMark Lodato1-3/+1
2010-02-28sha1_name: fix segfault caused by invalid index accessMarkus Heidelberg1-14/+18
2010-02-25Merge branch 'maint-1.6.6' into maintJunio C Hamano1-0/+1
2010-02-25t3301-notes: insert a shbang line in ./fake_editor.shJohannes Sixt1-0/+1
2010-02-24commit: quote the user name in the exampleMatt Kraai1-1/+1
2010-02-24Merge branch 'ml/maint-grep-doc' into maintJunio C Hamano1-5/+12
2010-02-23am: remove rebase-apply directory before gcJonathan Nieder1-2/+1
2010-02-23rerere: fix memory leak if rerere images can't be readBert Wesarg1-3/+6
2010-02-23Documentation: mention conflict marker size argument (%L) for merge driverBert Wesarg1-1/+2
2010-02-20git-p4: fix bug in symlink handlingEvan Powers1-3/+2
2010-02-19t1450: fix testcases that were wrongly expecting failureThomas Rast1-8/+8
2010-02-19Documentation: Fix indentation problem in git-commit(1)Jacob Helwig1-3/+3
2010-02-19Merge branch 'jk/maint-rmdir-fix' into maintJunio C Hamano2-1/+9
2010-02-18rm: fix bug in recursive subdirectory removalJeff King2-1/+9
2010-02-18Documentation: describe --thin more accuratelyStephen Boyd5-28/+36
2010-02-17docs: don't talk about $GIT_DIR/refs/ everywhereJeff King10-36/+39
2010-02-17Update 1.7.0.1 release notesJunio C Hamano1-1/+1
2010-02-17Merge branch 'jk/cherry-pick-reword' into maintJunio C Hamano1-23/+19
2010-02-17Merge branch 'jk/grep-double-dash' into maintJunio C Hamano2-0/+43
2010-02-17Merge branch 'jc/typo' into maintJunio C Hamano17-19/+20
2010-02-16grep documentation: clarify what files matchMark Lodato1-5/+12
2010-02-16Prepare 1.7.0.1 release notesJunio C Hamano1-1/+21
2010-02-16Merge branch 'jc/maint-grep-one-thread-mutex-fix' into maintJunio C Hamano1-9/+16
2010-02-16Fix use of mutex in threaded grepJunio C Hamano1-9/+16
2010-02-16Merge branch 'maint-1.6.6' into maintJunio C Hamano6-6/+19
2010-02-16Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano4-4/+17
2010-02-16dwim_ref: fix dangling symref warningJeff King1-2/+1
2010-02-15stash pop: remove 'apply' options during 'drop' invocationThomas Rast2-2/+14
2010-02-15diff: make sure --output=/bad/path is caughtLarry D'Anna1-0/+2
2010-02-15Remove hyphen from "git-command" in two error messagesPete Harlan2-2/+2
2010-02-14Merge branch 'maint-1.6.6' into maintJunio C Hamano1-0/+1
2010-02-14fix minor memory leak in get_tree_entry()René Scharfe1-0/+1
2010-02-13Start 1.7.0 maintenance trackJunio C Hamano3-2/+13
2010-02-12Git 1.7.0v1.7.0Junio C Hamano3-1/+11
2010-02-12Merge branch 'maint'Junio C Hamano2-2/+2
2010-02-12Fix typo in 1.6.6.2 release notesJunio C Hamano1-1/+1
2010-02-12Re-fix check-ref-format documentation mark-upJunio C Hamano1-1/+1
2010-02-12archive documentation: attributes are taken from the tree by defaultJunio C Hamano1-0/+8
2010-02-12Documentation: minor fixes to RelNotes-1.7.0Michael J Gruber1-8/+8
2010-02-12bash: support 'git am's new '--continue' optionSZEDER Gábor1-1/+1
2010-02-11Merge branch 'maint'Junio C Hamano1-1/+1
2010-02-11filter-branch: Fix error message for --prune-empty --commit-filterJacob Helwig1-1/+1
2010-02-11cherry-pick: prettify the advice messageJeff King1-4/+6
2010-02-11cherry-pick: show commit name instead of sha1Jeff King1-7/+7
2010-02-11cherry-pick: format help message as strbufJeff King1-4/+4
2010-02-11cherry-pick: refactor commit parsing codeJeff King1-8/+2
2010-02-11cherry-pick: rewrap advice messageJeff King1-4/+4
2010-02-11am: switch --resolved to --continueJeff King2-3/+5
2010-02-10Update draft release notes to 1.7.0 one more timeJunio C Hamano1-15/+1
2010-02-10Sync with 1.6.6.2Junio C Hamano4-4/+53
2010-02-10Git 1.6.6.2v1.6.6.2Junio C Hamano4-3/+50
2010-02-10Merge branch 'maint-1.6.5' into maintJunio C Hamano1-2/+4
2010-02-10t8003: check exit code of command and error message separatelyJunio C Hamano1-2/+4
2010-02-10Merge branch 'sp/maint-fast-import-large-blob' into maintJunio C Hamano5-20/+227
2010-02-10Merge branch 'gp/maint-cvsserver' into maintJunio C Hamano1-1/+1
2010-02-10Merge branch 'jc/maint-reflog-bad-timestamp' into maintJunio C Hamano4-10/+86
2010-02-10Merge branch 'il/maint-xmallocz' into maintJunio C Hamano4-10/+15
2010-02-10Merge branch 'jh/maint-config-file-prefix' into maintJunio C Hamano2-1/+12
2010-02-10Merge branch 'nd/include-termios-for-osol' into maintJunio C Hamano1-0/+1
2010-02-10Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maintJunio C Hamano2-1/+58
2010-02-10Merge branch 'rs/maint-archive-match-pathspec' into maintJunio C Hamano1-1/+24
2010-02-10check-ref-format documentation: fix enumeration mark-upJunio C Hamano1-1/+1
2010-02-10Documentation: quote braces in {upstream} notationThomas Rast1-1/+1
2010-02-08t3902: Protect against OS X normalizationBrian Gernhardt1-4/+4
2010-02-08Merge branch 'maint'Junio C Hamano5-14/+28
2010-02-08Merge branch 'maint-1.6.5' into maintJunio C Hamano2-1/+9
2010-02-08blame: prevent a segv when -L given start > EOFJay Soffian2-1/+9
2010-02-08Merge branch 'jc/maint-push-doc-status' into maintJunio C Hamano1-5/+10
2010-02-08git-push: document all the status flags used in the outputJunio C Hamano1-5/+10
2010-02-08Merge branch 'jc/maint-imap-config-parse' into maintJunio C Hamano1-7/+8
2010-02-08Fix parsing of imap.preformattedHTML and imap.sslverifyJunio C Hamano1-7/+8
2010-02-08Merge branch 'jc/maint-doc-git-add-example' into maintJunio C Hamano1-1/+1
2010-02-08git-add documentation: Fix shell quoting exampleJunio C Hamano1-1/+1
2010-02-08Revert "pack-objects: fix pack generation when using pack_size_limit"Nicolas Pitre2-12/+10
2010-02-07accept "git grep -- pattern"Jeff King2-0/+43
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-03Typofixes outside documentation areaJunio C Hamano17-19/+20
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-02-01Merge branch 'sb/maint-octopus' into maint-1.6.5Junio C Hamano2-9/+57
2010-02-01Merge branch 'bg/maint-add-all-doc' into maint-1.6.5Junio C Hamano2-29/+88
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