summaryrefslogtreecommitdiffstats
path: root/git-merge-octopus.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2011-12-13Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy12-50/+47
2011-12-12revert: convert resolve_ref() to read_ref_full()Nguyễn Thái Ngọc Duy1-1/+1
2011-12-09Update draft release notes for 1.7.9Junio C Hamano1-1/+36
2011-12-09am: don't persist keepcr flagMartin von Zweigbergk1-7/+0
2011-12-09mingw: give waitpid the correct signatureErik Faye-Lund2-2/+2
2011-12-08git symbolic-ref: documentation fixMichael Haggerty1-6/+3
2011-12-06Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy8-28/+66
2011-12-06Kick-off the 1.7.9 cycleJunio C Hamano3-2/+29
2011-12-06stripspace: fix outdated commentJeff King1-2/+0
2011-12-05git-p4: introduce skipSubmitEditPete Wyckoff3-24/+136
2011-12-05Add MYMETA.yml to perl/.gitignoreSebastian Morr1-0/+1
2011-12-05Documentation: fix formatting error in merge-options.txtJack Nagel1-1/+0
2011-12-02Git 1.7.8v1.7.8Junio C Hamano3-11/+8
2011-12-01git-svn.perl: close the edit for propedits even with no modsSteven Walter1-1/+1
2011-11-28Git 1.7.8-rc4v1.7.8-rc4Junio C Hamano2-2/+2
2011-11-28checkout,merge: loosen overwriting untracked file check based on info/excludeNguyễn Thái Ngọc Duy2-2/+2
2011-11-23builtin-reset: Documentation updateVincent van Ravesteijn1-4/+4
2011-11-23builtin-branch: Fix crash on invalid use of --forceVincent van Ravesteijn1-2/+2
2011-11-23revert --abort: do not leave behind useless sequencer-old directoryJonathan Nieder2-0/+9
2011-11-23Fix revert --abort on WindowsJohannes Sixt1-2/+2
2011-11-23revert: do not pass non-literal string as format to git_path()Nguyễn Thái Ngọc Duy1-1/+1
2011-11-23Update 1.7.8 draft release notes in preparation for rc4Junio C Hamano1-1/+1
2011-11-23revert: remove --reset compatibility optionJonathan Nieder2-5/+2
2011-11-23revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder5-3/+185
2011-11-22revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder4-3/+61
2011-11-22revert: improve error message for cherry-pick during cherry-pickJonathan Nieder1-7/+6
2011-11-22revert: rearrange pick_revisions() for clarityJonathan Nieder1-24/+24
2011-11-22revert: rename --reset option to --quitJonathan Nieder7-25/+49
2011-11-21convert.c: Fix return type of git_path_check_eol()Ramsay Jones1-1/+1
2011-11-21Show error for 'git merge' with unset merge.defaultToUpstreamVincent van Ravesteijn1-3/+6
2011-11-21documentation fix: git difftool uses diff tools, not merge tools.Thomas Hochstein1-1/+1
2011-11-21config.c: Fix a static buffer overwrite bug by avoiding mkpath()Ramsay Jones1-2/+2
2011-11-21t5501-*.sh: Fix url passed to clone in setup testRamsay Jones1-1/+1
2011-11-18Hopefully final update of release notes before 1.7.8 finalJunio C Hamano1-1/+1
2011-11-18refresh_index: make porcelain output more specificJeff King1-2/+21
2011-11-18refresh_index: rename format variablesJeff King1-6/+6
2011-11-18read-cache: let refresh_cache_ent pass up changed flagsJeff King1-3/+6
2011-11-18Makefile: add option to disable automatic dependency generationJonathan Nieder1-7/+24
2011-11-18Git 1.7.7.4v1.7.7.4Junio C Hamano3-2/+16
2011-11-18Makefile: add missing header file dependenciesJonathan Nieder1-2/+3
2011-11-18notes merge: eliminate OUTPUT macroJonathan Nieder1-43/+61
2011-11-18do not let git_path clobber errno when reporting errorsJonathan Nieder2-24/+34
2011-11-17Git 1.7.8-rc3v1.7.8-rc3Junio C Hamano2-5/+2
2011-11-17pack-object: tolerate broken packs that have duplicated objectsJunio C Hamano1-12/+43
2011-11-17receive-pack, fetch-pack: reject bogus pack that records objects twiceJunio C Hamano4-2/+11
2011-11-17refs: loosen over-strict "format" checkJunio C Hamano2-10/+17
2011-11-17mailmap: xcalloc mailmap_infoMarc-André Lureau1-3/+2
2011-11-16revert: prettify fatal messagesRamkumar Ramachandra1-5/+5
2011-11-16Add built-in diff patterns for MATLAB codeGustaf Hendeby7-1/+39
2011-11-16git-compat-util: don't assume value for undefined variableRamkumar Ramachandra1-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 09:04:27 +0100