summaryrefslogtreecommitdiffstats
path: root/merge-recursive.c (unfollow)
Commit message (Expand)AuthorFilesLines
2011-05-17Documentation/git-fsck.txt: fix typo: unreadable -> unreachableJim Meyering1-2/+2
2011-05-16Sync release notes for 1.7.6 to exclude what are in maintenance trackJunio C Hamano1-12/+0
2011-05-16Update draft release notes to 1.7.5.2Junio C Hamano1-0/+9
2011-05-16git_open_noatime(): drop unused parameterJunio C Hamano1-8/+7
2011-05-16sha1_file: typofixJunio C Hamano1-1/+1
2011-05-15add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder3-6/+6
2011-05-13Update draft release notes to 1.7.6Junio C Hamano1-30/+16
2011-05-13Prepare for 1.7.5.2Junio C Hamano2-1/+34
2011-05-13t5400: Fix a couple of typosJohan Herland1-2/+2
2011-05-13Tweak t3102-ls-tree-wildcards to run on WindowsJohannes Sixt1-7/+7
2011-05-11Update draft release notes to 1.7.6Junio C Hamano1-3/+18
2011-05-11Do not strip empty lines / trailing spaces from a commit message templateBoris Faure3-1/+25
2011-05-10Honor $(prefix) set in config.mak* when defining ETC_GIT*Johannes Sixt1-9/+9
2011-05-10Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf...Junio C Hamano1-10/+9
2011-05-09t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano1-2/+5
2011-05-08t3701: add-p-fix makes the last test to passJunio C Hamano1-1/+1
2011-05-08rerere: libify rerere_clear() and rerere_gc()Junio C Hamano3-75/+88
2011-05-08Remove gitweb/gitweb.cgi and other legacy targets from main MakefileJakub Narebski1-26/+0
2011-05-08git-instaweb: Simplify build dependency on gitwebJakub Narebski1-1/+1
2011-05-07tests: check git does not barf on merge.ff values for future versions of gitJonathan Nieder1-2/+14
2011-05-07tests: teach verify_parents to check for extra parentsJonathan Nieder1-0/+1
2011-05-07merge: introduce merge.ff configuration variableJunio C Hamano3-2/+60
2011-05-07merge: make branch.<name>.mergeoptions correctly override merge.<option>Junio C Hamano2-14/+57
2011-05-06tests: eliminate unnecessary setup test assertionsJonathan Nieder2-99/+97
2011-05-06Update draft release notes to 1.7.6Junio C Hamano1-3/+29
2011-05-06Remove duplicated "is a"João Britto1-1/+1
2011-05-06fast-import: fix option parser for no-arg optionsSverre Rabbelier1-3/+3
2011-05-05send-pack: unbreak push over stateless rpcJeff King1-1/+2
2011-05-05git-reset.txt: better docs for '--patch'Valentin Haenel1-3/+4
2011-05-05git-checkout.txt: better docs for '--patch'Valentin Haenel1-3/+4
2011-05-05git-stash.txt: better docs for '--patch'Valentin Haenel1-4/+5
2011-05-05git-add.txt: document 'interactive.singlekey'Valentin Haenel1-1/+5
2011-05-05config.txt: 'interactive.singlekey; is used by...Valentin Haenel1-2/+3
2011-05-05t3701: fix here documentJunio C Hamano1-3/+2
2011-05-05git-fast-import.txt: --relative-marks takes no parameterMichael J Gruber1-2/+2
2011-05-05shell: add missing initialization of argv0_pathDima Sharov1-0/+2
2011-05-05t/annotate-tests: Use echo & cat instead of sedBrian Gernhardt1-1/+2
2011-05-05Update draft release notes to 1.7.6Junio C Hamano1-27/+13
2011-05-05Git 1.7.5.1v1.7.5.1Junio C Hamano3-2/+36
2011-05-04git-add.txt: document 'add.ignoreErrors'Valentin Haenel1-0/+2
2011-05-04t5541-http-push: add test for chunkedTay Ray Chuan1-2/+16
2011-05-04http-push: refactor curl_easy_setup madnessDan McGee1-96/+48
2011-05-04http-push: use const for strings in signaturesDan McGee1-4/+4
2011-05-04http: make curl callbacks match contracts from curl headerDan McGee4-12/+12
2011-05-03Update draft release notes to 1.7.6Junio C Hamano1-5/+15
2011-05-02Documentation: clarify meaning of --html-path, --man-path, and --info-pathJonathan Nieder1-6/+6
2011-05-02git: add --info-path and --man-path optionsJon Seymour3-3/+19
2011-05-02Update draft release notes to 1.7.6Junio C Hamano1-2/+7
2011-05-02Pass empty file to p4merge where no base is suitable.Ciaran Jessup1-6/+3
2011-05-01Look for password in both CVS and CVSNT password files.Guy Rouillier1-12/+41
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 14:07:12 +0100