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-resolve-script
Age
Commit message (
Expand
)
Author
2005-08-24
Try to find the optimum merge base while resolving.
Junio C Hamano
2005-08-20
git-resolve: dying is good, not showing help is bad.
Junio C Hamano
2005-08-14
[PATCH] Make sure git-resolve-script always works on commits
Linus Torvalds
2005-07-23
[PATCH] Audit rev-parse users.
Junio C Hamano
2005-07-09
Make "git resolve" take the merge message in $3
Linus Torvalds
2005-07-08
Add "git-sh-setup-script" for common git shell script setup
Linus Torvalds
2005-06-22
Clean up different special *HEAD handling
Linus Torvalds
2005-06-21
[PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse
Dan Holmsand
2005-06-20
Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.
Linus Torvalds
2005-06-15
Trivial git script fixups
Linus Torvalds
2005-06-09
Make "git commit" work correctly in the presense of a manual merge
Linus Torvalds
2005-06-08
Make default merge messages denser.
Linus Torvalds
2005-06-07
git-resolve-script: stop when the automated merge fails
Linus Torvalds
2005-06-07
git-resolve-script: don't wait for three seconds any more
Linus Torvalds
2005-06-06
More work on merging with git-read-tree..
Linus Torvalds
2005-06-06
git-read-tree: be a lot more careful about merging dirty trees
Linus Torvalds
2005-05-31
git-resolve-script: use "git-apply --stat" instead of diffstat
Linus Torvalds
2005-05-25
[PATCH] optimize git-resolve-script
Jeff Garzik
2005-05-10
Introduce GIT_DIR environment variable.
Junio C Hamano
2005-05-06
Fix git-resolve-script.
Linus Torvalds
2005-05-05
Split "git-pull-script" into two parts
Linus Torvalds