Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
github.com/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
github.com/git/git.git
jch
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
www-data
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-merge.sh
Age
Commit message (
Expand
)
Author
2007-09-24
Supplant the "while case ... break ;; esac" idiom
David Kastrup
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
2006-12-06
git-merge: squelch needless error message.
Junio C Hamano
2006-12-06
Loosen "working file will be lost" check in Porcelain-ish
Junio C Hamano
2006-12-03
git-merge: fix confusion between tag and branch
Junio C Hamano
2006-11-27
git-merge: do not leak rev-parse output used for checking internally.
Junio C Hamano
2006-11-27
git-merge: tighten error checking.
Junio C Hamano
2006-11-22
merge: allow merging into a yet-to-be-born branch.
Junio C Hamano
2006-11-22
git-merge: make it usable as the first class UI
Junio C Hamano
2006-11-22
remove merge-recursive-old
Junio C Hamano
2006-10-23
Merge branch 'maint'
Junio C Hamano
2006-10-22
git-merge: show usage if run without arguments
Rene Scharfe
2006-10-01
merge and resolve: Output short hashes and .. in "Updating ..."
Santi Béjar
2006-09-25
Deprecate merge-recursive.py
Junio C Hamano
2006-07-31
Merge branch 'js/read-tree' into js/c-merge-recursive
Junio C Hamano
2006-07-14
recur vs recursive: help testing without touching too many stuff.
Junio C Hamano
2006-07-14
Status update on merge-recursive in C
Johannes Schindelin
2006-07-12
Log ref changes made by git-merge and git-pull.
Shawn Pearce
2006-06-27
Fix expr usage for FreeBSD
Dennis Stosberg
2006-06-24
git-merge --squash
Junio C Hamano
2006-06-24
git-merge: Don't use -p when outputting summary
Timo Hirvonen
[next]