summaryrefslogtreecommitdiff
path: root/git-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2008-03-05specify explicit "--pretty=medium" with `git log/show/whatchanged`Libravatar Denis Cheng1-1/+1
2008-03-03git-merge.sh: better handling of combined --squash,--no-ff,--no-commit optionsLibravatar Gerrit Pape1-6/+11
2007-11-17Merge branch 'ph/parseopt-sh'Libravatar Junio C Hamano1-72/+54
2007-11-14Merge branch 'jc/stash-create'Libravatar Junio C Hamano1-6/+5
2007-11-05Migrate git-merge.sh to use git-rev-parse --parseoptLibravatar Pierre Habouzit1-72/+54
2007-11-01git-merge: no reason to use cpio anymoreLibravatar Junio C Hamano1-6/+5
2007-10-03Merge branch 'lh/merge'Libravatar Junio C Hamano1-11/+54
2007-10-03Merge branch 'jc/autogc'Libravatar Junio C Hamano1-0/+1
2007-09-23Merge branch 'je/hooks'Libravatar Junio C Hamano1-0/+13
2007-09-23git-merge: add --ff and --no-ff optionsLibravatar Lars Hjemli1-6/+16
2007-09-23git-merge: add support for --commit and --no-squashLibravatar Lars Hjemli1-2/+6
2007-09-23git-merge: add support for branch.<name>.mergeoptionsLibravatar Lars Hjemli1-0/+21
2007-09-23git-merge: refactor option parsingLibravatar Lars Hjemli1-6/+14
2007-09-23git-merge: fix faulty SQUASH_MSGLibravatar Lars Hjemli1-1/+1
2007-09-23Supplant the "while case ... break ;; esac" idiomLibravatar David Kastrup1-1/+1
2007-09-18Add post-merge hook, related documentation, and tests.Libravatar Josh England1-0/+13
2007-09-06Invoke "git gc --auto" from commit, merge, am and rebase.Libravatar Junio C Hamano1-0/+1
2007-08-27git-merge: do up-to-date check also for all strategiesLibravatar Junio C Hamano1-15/+20
2007-07-06Enable "git rerere" by the config variable rerere.enabledLibravatar Johannes Schindelin1-4/+1
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-36/+36
2007-05-29Merge branch 'ar/mergestat'Libravatar Junio C Hamano1-6/+12
2007-05-26Merge branch 'maint'Libravatar Junio C Hamano1-3/+3
2007-05-26Merge branch 'maint-1.5.1' into maintLibravatar Junio C Hamano1-3/+3
2007-05-26More echo "$user_message" fixes.Libravatar Jeff King1-3/+3
2007-05-24Add a configuration option to control diffstat after mergeLibravatar Alex Riesen1-6/+12
2007-05-10Add colour support in rebase and merge tree diff stats output.Libravatar James Bowes1-1/+2
2007-04-07A new merge stragety 'subtree'.Libravatar Junio C Hamano1-2/+2
2007-03-22git-merge: Put FETCH_HEAD data in merge commit messageLibravatar Michael S. Tsirkin1-0/+4
2007-03-16git-merge: finish when git-read-tree failsLibravatar Santi Béjar1-2/+2
2007-03-11git-merge: warn when -m provided on a fast forwardLibravatar J. Bruce Fields1-1/+6
2007-03-03git-merge: fail correctly when we cannot fast forward.Libravatar Junio C Hamano1-1/+1
2007-02-16git-merge: minor fix for no_trivial_merge_strategies.Libravatar Junio C Hamano1-6/+9
2007-01-28[PATCH] Rename git-repo-config to git-config.Libravatar Tom Prince1-2/+2
2007-01-26git-merge: leave sensible reflog message when used as the first level UI.Libravatar Junio C Hamano1-1/+1
2007-01-14Merge branch 'sp/merge' (early part)Libravatar Junio C Hamano1-17/+23
2007-01-12Allow whole-tree operations to be started from a subdirectoryLibravatar Junio C Hamano1-1/+3
2007-01-10Improve merge performance by avoiding in-index merges.Libravatar Shawn O. Pearce1-17/+23
2007-01-10Disallow working directory commands in a bare repository.Libravatar Shawn O. Pearce1-0/+1
2007-01-01fail pull/merge early in the middle of conflicted mergeLibravatar Junio C Hamano1-0/+3
2006-12-28Honor pull.{twohead,octopus} in git-merge.Libravatar Shawn O. Pearce1-2/+14
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Libravatar Shawn O. Pearce1-8/+5
2006-12-23Display 'theirs' branch name when possible in merge.Libravatar Shawn O. Pearce1-0/+2
2006-12-22merge and reset: adjust for "reset --hard" messagesLibravatar Junio C Hamano1-1/+1
2006-12-16merge: give a bit prettier merge message to "merge branch~$n"Libravatar Junio C Hamano1-9/+17
2006-12-13Merge branch 'jc/read-tree-ignore'Libravatar Junio C Hamano1-1/+1
2006-12-13git merge: reword failure message.Libravatar Junio C Hamano1-1/+8
2006-12-06git-merge: fix "fix confusion between tag and branch" for realLibravatar Junio C Hamano1-2/+3
2006-12-06git-merge: squelch needless error message.Libravatar Junio C Hamano1-1/+1
2006-12-05Loosen "working file will be lost" check in Porcelain-ishLibravatar Junio C Hamano1-1/+1
2006-12-02git-merge: fix confusion between tag and branchLibravatar Junio C Hamano1-5/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 04:43:26 +0000