summaryrefslogtreecommitdiffstats
path: root/Documentation/.gitattributes (unfollow)
Commit message (Expand)AuthorFilesLines
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-24rebase -i: Export GIT_AUTHOR_* variables explicitlyJunio C Hamano1-4/+4
2010-01-23Documentation: rev-list: fix synopsys for --tags and and --remotesChristian Couder1-2/+2
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-23t7800-difftool.sh: Test mergetool.prompt fallbackDavid Aguilar1-0/+12
2010-01-23msvc: Add a definition of NORETURN compatible with msvc compilerRamsay Jones1-0/+3
2010-01-23Update draft release notes to 1.7.0Junio C Hamano1-1/+26
2010-01-23msvc: Fix a compiler warning due to an incorrect pointer castRamsay Jones1-1/+1
2010-01-23msvc: Fix an "unrecognized option" linker warningRamsay Jones2-0/+2
2010-01-23Make difftool.prompt fall back to mergetool.promptSebastian Schuberth1-1/+2
2010-01-23engine.pl: Fix a recent breakage of the buildsystem generatorRamsay Jones1-3/+5
2010-01-23ignore 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-22make "git patch-id" a built-inLinus Torvalds4-4/+4
2010-01-22make "git var" a built-inLinus Torvalds4-4/+4
2010-01-22fix git-p4 editor invocationNicolas Pitre1-1/+1
2010-01-22Documentation: improve description of --glob=pattern and friendsThomas Rast1-17/+15
2010-01-22make "git hash-object" a built-inLinus Torvalds4-5/+4
2010-01-22make "git merge-tree" a built-inLinus Torvalds4-4/+4
2010-01-22slim down "git show-index"Linus Torvalds4-67/+69
2010-01-22Remove diff machinery dependency from read-cacheLinus Torvalds2-78/+76
2010-01-22merge-recursive: do not return NULL only to cause segfaultJunio C Hamano1-4/+4
2010-01-22git-rebase.txt: Fix spellingHorst H. von Brand1-1/+1
2010-01-22retry 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