summaryrefslogtreecommitdiffstats
path: root/builtin-merge-ours.c (unfollow)
Commit message (Expand)AuthorFilesLines
2008-04-13bisect: report bad rev betterChristian Couder1-2/+2
2008-04-12bisect: fix bad rev checking in "git bisect good"Christian Couder2-9/+18
2008-04-12revision.c: make --date-order overriddableMichele Ballabio1-0/+1
2008-04-12Fix section about backdating tags in the git-tag docsBjörn Steinbrink1-2/+2
2008-04-11Document option --only of git commitJohannes Sixt2-1/+12
2008-04-11Documentation/git-request-pull: Fixed a typo ("send" -> "end")Dirk Suesserott1-1/+1
2008-04-10core-tutorial.txt: Fix showing the current behaviour.Carlos Rica1-6/+6
2008-04-10git-archive: ignore prefix when checking file attributeRené Scharfe3-5/+22
2008-04-10Fix documentation syntax of optional arguments in short options.Carlos Rica3-4/+4
2008-04-07Fix "git apply" to correctly enforce "match at the beginning"Junio C Hamano2-13/+29
2008-03-28GIT 1.5.4.5v1.5.4.5Junio C Hamano2-7/+1
2008-03-27Update draft release notes for 1.5.4.5Junio C Hamano1-1/+10
2008-03-27Documentation: clarify use of .git{ignore,attributes} versus .git/info/*Jeff King2-0/+19
2008-03-26t/t3800-mktag.sh: use test_must_fail rather than '!'Brandon Casey1-2/+2
2008-03-26git-fetch test: test tracking fetch results, not just FETCH_HEADJunio C Hamano65-7/+831
2008-03-26Fix branches file configurationDaniel Barkalow1-6/+22
2008-03-26Tighten refspec processingDaniel Barkalow5-42/+214
2008-03-26Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.Guanqun Lu1-1/+1
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-15format-patch: generate MIME header as needed even when there is format.headerJunio C Hamano5-16/+57
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-15rev-parse: fix meaning of rev~ vs rev~0.Linus Torvalds1-13/+15
2008-03-15git-svn: don't blindly append '*' to branch/tags configEric Wong1-1/+2
2008-03-14merge-file: handle empty files gracefullyJohannes Schindelin2-3/+4
2008-03-14merge-recursive: handle file mode changesClemens Buchacher2-2/+62
2008-03-14Minor wording changes in the keyboard descriptions in git-add --interactive.Vineet Kumar1-10/+8
2008-03-13git fetch: Take '-n' to mean '--no-tags'Johannes Schindelin1-0/+2
2008-03-13quiltimport: fix misquoting of parsed -p<num> parameterJunio C Hamano1-2/+2
2008-03-13git-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-12git-svn: fix find-rev error message when missing argMarc-Andre Lureau1-1/+2
2008-03-12t0021: tr portability fix for SolarisJeff King1-1/+3
2008-03-12launch_editor(): allow spaces in the filenameJohannes Schindelin2-1/+32
2008-03-12git rebase --abort: always restore the right commitMike Hommey2-3/+73
2008-03-10git-pull documentation: warn about the option orderJunio C Hamano1-0/+2
2008-03-10git-quiltimport: better parser to grok "enhanced" series files.Pierre Habouzit1-3/+19
2008-03-09GIT 1.5.4.4v1.5.4.4Junio C Hamano2-7/+27
2008-03-09ident.c: reword error message when the user name cannot be determinedSanti Béjar1-1/+1
2008-03-09Fix 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-08Really make the LF after reset in fast-import optionalAdeodato Simó2-1/+4
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-05shortlog: take the first populated line of the descriptionAndy Whitcroft1-2/+3
2008-03-05git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl failsShawn O. Pearce1-0/+5
2008-03-04Fix 'git remote show' regression on empty repository in 1.5.4Shawn O. Pearce1-4/+0
2008-03-03Fix incorrect wording in git-merge.txt.Matthieu Moy1-1/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 10:46:22 +0100