summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-23rebase -i: Export GIT_AUTHOR_* variables explicitlyJunio C Hamano1-4/+4
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
2010-01-21make "git var" a built-inLinus Torvalds4-4/+4
2010-01-21fix git-p4 editor invocationNicolas Pitre1-1/+1
2010-01-21Documentation: improve description of --glob=pattern and friendsThomas Rast1-17/+15
2010-01-21Merge branch 'maint'Junio C Hamano2-6/+20
2010-01-21make "git hash-object" a built-inLinus Torvalds4-5/+4
2010-01-21make "git merge-tree" a built-inLinus Torvalds4-4/+4
2010-01-21slim down "git show-index"Linus Torvalds4-67/+69
2010-01-21Remove diff machinery dependency from read-cacheLinus Torvalds2-78/+76
2010-01-21merge-recursive: do not return NULL only to cause segfaultJunio C Hamano1-4/+4
2010-01-21git-rebase.txt: Fix spellingHorst H. von Brand1-1/+1
2010-01-21retry request without query when info/refs?query failsTay Ray Chuan1-2/+16
2010-01-21Fix "log --oneline" not to show notesJunio C Hamano3-4/+7
2010-01-21Make 'rerere forget' work from a subdirectory.Johannes Sixt2-24/+53
2010-01-21Make test case numbers uniqueJohannes Sixt2-0/+0
2010-01-20conflict-marker-size: add test and docsJunio C Hamano2-0/+29
2010-01-20Update draft release notes to 1.7.0Junio C Hamano1-1/+45
2010-01-20Merge branch 'bw/cvsimport'Junio C Hamano1-35/+35
2010-01-20Merge branch 'jc/checkout-merge-base'Junio C Hamano1-2/+4
2010-01-20Merge branch 'ag/patch-header-verify'Junio C Hamano2-1/+39
2010-01-20Merge branch 'jc/conflict-marker-size'Junio C Hamano16-78/+155
2010-01-20Merge branch 'ag/maint-apply-too-large-p'Junio C Hamano2-2/+14
2010-01-20Merge branch 'ap/merge-backend-opts'Junio C Hamano21-54/+392
2010-01-20Merge branch 'nd/status-partial-refresh'Junio C Hamano3-3/+4
2010-01-20Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano116-685/+693
2010-01-20Merge branch 'jh/notes' (early part)Junio C Hamano4-18/+895
2010-01-20Merge branch 'maint'Junio C Hamano0-0/+0
2010-01-20Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maintJunio C Hamano1-4/+6
2010-01-20Fix memory corruption when .gitignore does not end by \nNguyễn Thái Ngọc Duy1-3/+13
2010-01-20Fix "log" family not to be too agressive about showing notesJunio C Hamano8-1/+82
2010-01-20Merge branch 'rr/core-tutorial'Junio C Hamano1-0/+8
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano14-47/+652
2010-01-20Merge branch 'js/exec-error-report'Junio C Hamano5-50/+191
2010-01-20Merge branch 'jc/ls-files-ignored-pathspec'Junio C Hamano2-64/+174
2010-01-20Merge branch 'jc/grep-lookahead'Junio C Hamano7-370/+166
2010-01-20Merge branch 'jc/maint-strbuf-add-fix-doubling'Junio C Hamano1-0/+1
2010-01-20Merge branch 'mm/conflict-advice'Junio C Hamano9-13/+93
2010-01-20Merge branch 'da/difftool'Junio C Hamano5-27/+118
2010-01-20Merge branch 'mh/rebase-fixup'Junio C Hamano3-112/+219
2010-01-20Merge branch 'ns/rebase-auto-squash'Junio C Hamano3-0/+120
2010-01-20Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano4-68/+137
2010-01-20Merge branch 'il/push-set-upstream'Junio C Hamano5-1/+136
2010-01-20Merge branch 'jk/warn-author-committer-after-commit'Junio C Hamano11-5/+88
2010-01-20Merge branch 'jc/ident'Junio C Hamano4-13/+24
2010-01-20Merge branch 'tr/http-push-ref-status'Junio C Hamano6-49/+137
2010-01-20Merge branch 'bk/fix-relative-gitdir-file'Junio C Hamano2-3/+57
2010-01-20Merge branch 'sd/cd-p-show-toplevel'Junio C Hamano3-14/+14
2010-01-20Merge branch 'jc/symbol-static'Junio C Hamano30-142/+34
2010-01-20date.c: mark file-local function staticJunio C Hamano2-2/+1
2010-01-20Sync with 1.6.6.1Junio C Hamano3-8/+45
2010-01-20Git 1.6.6.1v1.6.6.1Junio C Hamano3-8/+16
2010-01-20Merge branch 'bg/maint-remote-update-default' into maintJunio C Hamano2-6/+18
2010-01-20Merge branch 'sb/maint-octopus' into maintJunio C Hamano2-9/+57
2010-01-20Merge branch 'bg/maint-add-all-doc' into maintJunio C Hamano2-29/+88
2010-01-20Merge branch 'maint-1.6.5' into maintJunio C Hamano5-9/+40
2010-01-20Git 1.6.5.8v1.6.5.8Junio C Hamano4-3/+32
2010-01-20rev-parse --branches/--tags/--remotes=patternIlari Liusvaara9-20/+139
2010-01-20rev-parse --globIlari Liusvaara9-2/+223
2010-01-20Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5Junio C Hamano2-4/+8
2010-01-20Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1...Junio C Hamano1-4/+2
2010-01-20Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5Junio C Hamano1-5/+5
2010-01-20Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5Junio C Hamano1-0/+1
2010-01-20Teach @{upstream} syntax to strbuf_branchanme()Junio C Hamano2-45/+77
2010-01-20t1506: more test for @{upstream} syntaxJunio C Hamano1-0/+41
2010-01-19Fix "checkout A..." synonym for "checkout A...HEAD" on WindowsJunio C Hamano1-2/+4
2010-01-19status: don't require the repository to be writableJunio C Hamano1-4/+6
2010-01-19Merge branch 'maint'Junio C Hamano1-3/+5
2010-01-19Makefile: honor NO_CURL when setting REMOTE_CURL_* variablesJohannes Sixt1-10/+6
2010-01-19ident.c: replace fprintf with fputs to suppress compiler warningTarmigan Casebolt1-1/+1
2010-01-19rm: only refresh entries that we may touchNguyễn Thái Ngọc Duy1-1/+2
2010-01-19bisect: fix singular/plural grammar nitDavid Ripton1-3/+5
2010-01-19cvsimport: standarize system() calls to external git toolsBen Walton1-5/+5
2010-01-19cvsimport: standarize open() calls to external git toolsBen Walton1-4/+4
2010-01-19cvsimport: modernize callouts to git subcommandsBen Walton1-32/+32
2010-01-18Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano8-43/+47
2010-01-18Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano8-43/+47
2010-01-18Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano8-43/+47
2010-01-18Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano1-1/+5
2010-01-18Fix mis-backport of t7002Junio C Hamano1-1/+5
2010-01-18Update draft release notes to 1.7.0Junio C Hamano1-1/+16
2010-01-18Merge branch 'maint'Junio C Hamano3-6/+22
2010-01-18Update draft release notes to 1.6.6.1Junio C Hamano1-1/+16
2010-01-18Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maintJunio C Hamano1-5/+5
2010-01-18Merge branch 'jc/rerere'Junio C Hamano12-18/+77
2010-01-18Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Junio C Hamano2-2/+19
2010-01-18Merge branch 'nd/include-termios-for-osol'Junio C Hamano1-0/+1
2010-01-18Merge branch 'js/windows'Junio C Hamano8-133/+329
2010-01-18branch: warn and refuse to set a branch as a tracking branch of itself.Matthieu Moy1-2/+12
2010-01-18Performance optimization for detection of modified submodulesJens Lehmann6-29/+56
2010-01-18Add branch --set-upstreamIlari Liusvaara5-11/+52
2010-01-18builtin-apply.c: fix the --- and +++ header filename consistency checkAndreas Gruenbacher2-1/+39
2010-01-18Add git remote set-urlIlari Liusvaara3-1/+330
2010-01-18Replace parse_blob() with an explanatory commentDaniel Barkalow2-22/+8
2010-01-18Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maintJunio C Hamano1-0/+1
2010-01-18grep: NUL terminate input from a fileJim Meyering1-0/+1
2010-01-18builtin-apply.c: Skip filenames without enough componentsAndreas Gruenbacher2-2/+14
2010-01-17symlinks.c: remove unused functionsJunio C Hamano2-33/+0
2010-01-17object.c: remove unused functionsJunio C Hamano2-26/+0
2010-01-17Document that merge strategies can now take their own optionsJunio C Hamano2-1/+33
2010-01-17Extend merge-subtree tests to test -Xsubtree=dir.Avery Pennarun1-1/+46
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano6-18/+91
2010-01-17pull: Fix parsing of -X<option>Junio C Hamano1-7/+14
2010-01-17Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2-2/+23
2010-01-17git merge -X<option>Avery Pennarun11-26/+162
2010-01-17Update draft release notes to 1.7.0Junio C Hamano1-1/+38
2010-01-17Merge branch 'tc/test-locate-httpd'Junio C Hamano1-6/+24
2010-01-17Merge branch 'jh/commit-status'Junio C Hamano4-3/+134
2010-01-17Merge branch 'jn/makefile'Junio C Hamano2-34/+26
2010-01-17Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Junio C Hamano2-1/+58
2010-01-17Merge branch 'tc/clone-v-progress'Junio C Hamano6-7/+20
2010-01-17Merge branch 'tc/smart-http-restrict'Junio C Hamano7-260/+362
2010-01-17Merge branch 'jk/run-command-use-shell'Junio C Hamano11-35/+69
2010-01-17Merge branch 'sr/gfi-options'Junio C Hamano3-86/+462
2010-01-17git status: Show uncommitted submodule changes too when enabledJens Lehmann4-9/+15
2010-01-17Update COPYING with GPLv2 with new FSF addressJunio C Hamano1-13/+12
2010-01-17user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereJunio C Hamano3-2/+8
2010-01-17user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereJunio C Hamano3-1/+11
2010-01-17rerere: honor conflict-marker-size attributeJunio C Hamano3-2/+20
2010-01-17rerere: prepare for customizable conflict marker lengthJunio C Hamano1-10/+44
2010-01-17commit.c::print_summary: do not release the format string too earlyJunio C Hamano1-1/+1
2010-01-16conflict-marker-size: new attributeJunio C Hamano1-25/+34
2010-01-16rerere: use ll_merge() instead of using xdl_merge()Junio C Hamano1-4/+1
2010-01-16merge-tree: use ll_merge() not xdl_merge()Junio C Hamano2-11/+9
2010-01-16xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2-8/+18
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano6-12/+17
2010-01-16git_attr(): fix function signatureJunio C Hamano9-14/+19
2010-01-16Do not use date.c:tm_to_time_t() from compat/mingw.cJohannes Sixt1-17/+19
2010-01-16MSVC: Windows-native implementation for subset of Pthreads APIAndrzej K. Haczewski6-11/+217
2010-01-16Merge branch 'maint'Junio C Hamano3-4/+6
2010-01-16Merge branch 'cc/reset-more'Junio C Hamano1-10/+10
2010-01-16Documentation: Update git core tutorial clarifying reference to scriptsRamkumar Ramachandra1-0/+8
2010-01-16MSVC: Fix an "incompatible pointer types" compiler warningRamsay Jones2-25/+19
2010-01-16Windows: avoid the "dup dance" when spawning a child processJohannes Sixt3-49/+50
2010-01-16Windows: simplify the pipe(2) implementationJohannes Sixt1-29/+8
2010-01-16Windows: boost startup by avoiding a static dependency on shell32.dllJohannes Sixt1-2/+14
2010-01-16Windows: disable PythonErik Faye-Lund1-0/+2
2010-01-16Teach diff that modified submodule directory is dirtyJunio C Hamano2-3/+90
2010-01-16Show submodules as modified when they contain a dirty work treeJens Lehmann4-17/+124
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-18 19:28:57 +0000