Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-merge.sh
Age
Commit message (
Expand
)
Author
2008-04-13
merge, pull: add '--(no-)log' command line option
SZEDER Gábor
2008-04-13
add 'merge.stat' config variable
SZEDER Gábor
2008-04-13
merge, pull: introduce '--(no-)stat' option
SZEDER Gábor
2008-03-05
specify explicit "--pretty=medium" with `git log/show/whatchanged`
Denis Cheng
2008-03-04
git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
Gerrit Pape
2007-11-18
Merge branch 'ph/parseopt-sh'
Junio C Hamano
2007-11-15
Merge branch 'jc/stash-create'
Junio C Hamano
2007-11-06
Migrate git-merge.sh to use git-rev-parse --parseopt
Pierre Habouzit
2007-11-02
git-merge: no reason to use cpio anymore
Junio C Hamano
2007-10-03
Merge branch 'lh/merge'
Junio C Hamano
2007-10-03
Merge branch 'jc/autogc'
Junio C Hamano
2007-09-24
Merge branch 'je/hooks'
Junio C Hamano
2007-09-24
git-merge: add --ff and --no-ff options
Lars Hjemli
2007-09-24
git-merge: add support for --commit and --no-squash
Lars Hjemli
2007-09-24
git-merge: add support for branch.<name>.mergeoptions
Lars Hjemli
2007-09-24
git-merge: refactor option parsing
Lars Hjemli
2007-09-24
git-merge: fix faulty SQUASH_MSG
Lars Hjemli
2007-09-24
Supplant the "while case ... break ;; esac" idiom
David Kastrup
2007-09-19
Add post-merge hook, related documentation, and tests.
Josh England
2007-09-06
Invoke "git gc --auto" from commit, merge, am and rebase.
Junio C Hamano
2007-08-28
git-merge: do up-to-date check also for all strategies
Junio C Hamano
2007-07-07
Enable "git rerere" by the config variable rerere.enabled
Johannes Schindelin
2007-07-03
Rewrite "git-frotz" to "git frotz"
Junio C Hamano
2007-05-29
Merge branch 'ar/mergestat'
Junio C Hamano
2007-05-27
Merge branch 'maint'
Junio C Hamano
2007-05-26
Merge branch 'maint-1.5.1' into maint
Junio C Hamano
2007-05-26
More echo "$user_message" fixes.
Jeff King
2007-05-25
Add a configuration option to control diffstat after merge
Alex Riesen
2007-05-11
Add colour support in rebase and merge tree diff stats output.
James Bowes
2007-04-07
A new merge stragety 'subtree'.
Junio C Hamano
2007-03-22
git-merge: Put FETCH_HEAD data in merge commit message
Michael S. Tsirkin
2007-03-16
git-merge: finish when git-read-tree fails
Santi Béjar
2007-03-12
git-merge: warn when -m provided on a fast forward
J. Bruce Fields
2007-03-04
git-merge: fail correctly when we cannot fast forward.
Junio C Hamano
2007-02-17
git-merge: minor fix for no_trivial_merge_strategies.
Junio C Hamano
2007-01-29
[PATCH] Rename git-repo-config to git-config.
Tom Prince
2007-01-27
git-merge: leave sensible reflog message when used as the first level UI.
Junio C Hamano
2007-01-14
Merge branch 'sp/merge' (early part)
Junio C Hamano
2007-01-13
Allow whole-tree operations to be started from a subdirectory
Junio C Hamano
2007-01-11
Improve merge performance by avoiding in-index merges.
Shawn O. Pearce
2007-01-11
Disallow working directory commands in a bare repository.
Shawn O. Pearce
2007-01-02
fail pull/merge early in the middle of conflicted merge
Junio C Hamano
2006-12-28
Honor pull.{twohead,octopus} in git-merge.
Shawn O. Pearce
2006-12-28
Use GIT_REFLOG_ACTION environment variable instead.
Shawn O. Pearce
2006-12-23
Display 'theirs' branch name when possible in merge.
Shawn O. Pearce
2006-12-23
merge and reset: adjust for "reset --hard" messages
Junio C Hamano
2006-12-16
merge: give a bit prettier merge message to "merge branch~$n"
Junio C Hamano
2006-12-13
Merge branch 'jc/read-tree-ignore'
Junio C Hamano
2006-12-13
git merge: reword failure message.
Junio C Hamano
2006-12-06
git-merge: fix "fix confusion between tag and branch" for real
Junio C Hamano
[next]