Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
Accumulated documentation updates.
[gitweb.git]
/
git-resolve-script
2005-08-29
Merge refs/heads/portable from cs.berkeley.edu/~ejr...
blob
|
diff
|
raw
2005-08-24
Merge refs/heads/master from .
blob
|
diff
|
raw
2005-08-24
Try to find the optimum merge base while resolving.
blob
|
diff
|
raw
2005-08-20
Merge with master to pick up commit hook works.
blob
|
diff
|
raw
|
diff to current
2005-08-20
git-resolve: dying is good, not showing help is bad.
blob
|
diff
|
raw
|
diff to current
2005-08-19
Merge from gitk
blob
|
diff
|
raw
|
diff to current
2005-08-18
Merge with gitk --parents change.
blob
|
diff
|
raw
|
diff to current
2005-08-18
Merge with gitk
blob
|
diff
|
raw
|
diff to current
2005-08-14
Merge master into rc
blob
|
diff
|
raw
|
diff to current
2005-08-14
[PATCH] Make sure git-resolve-script always works on...
blob
|
diff
|
raw
|
diff to current
2005-08-12
Merge with gitk.
blob
|
diff
|
raw
|
diff to current
2005-08-10
Merge with gitk.
blob
|
diff
|
raw
|
diff to current
2005-08-09
Merge with gitk.
blob
|
diff
|
raw
|
diff to current
2005-08-08
Merge with gitk.
blob
|
diff
|
raw
|
diff to current
2005-08-07
Merge with gitk.
blob
|
diff
|
raw
|
diff to current
2005-08-06
Merge with gitk.
blob
|
diff
|
raw
|
diff to current
2005-08-05
Merge with gitk.
blob
|
diff
|
raw
|
diff to current
2005-07-31
Merge with gitk.
blob
|
diff
|
raw
|
diff to current
2005-07-29
Merge with gitk.
blob
|
diff
|
raw
|
diff to current
2005-07-23
[PATCH] Audit rev-parse users.
blob
|
diff
|
raw
|
diff to current
2005-07-18
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-07-16
Merge git-tools repository under "tools" subdirectory
blob
|
diff
|
raw
|
diff to current
2005-07-09
Make "git resolve" take the merge message in $3
blob
|
diff
|
raw
|
diff to current
2005-07-08
Add "git-sh-setup-script" for common git shell script...
blob
|
diff
|
raw
|
diff to current
2005-07-06
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-06-28
Merge rsync://rsync.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-06-22
Do a cross-project merge of Paul Mackerras' gitk visualizer
blob
|
diff
|
raw
|
diff to current
2005-06-21
Clean up different special *HEAD handling
blob
|
diff
|
raw
|
diff to current
2005-06-20
[PATCH] git-resolve-script: Add LAST_MERGE and use...
blob
|
diff
|
raw
|
diff to current
2005-06-20
Clean up MERGE_HEAD and ORIG_HEAD also for the trivial...
blob
|
diff
|
raw
|
diff to current
2005-06-15
Trivial git script fixups
blob
|
diff
|
raw
|
diff to current
2005-06-08
Make "git commit" work correctly in the presense of...
blob
|
diff
|
raw
|
diff to current
2005-06-08
Make default merge messages denser.
blob
|
diff
|
raw
|
diff to current
2005-06-07
git-resolve-script: stop when the automated merge fails
blob
|
diff
|
raw
|
diff to current
2005-06-07
git-resolve-script: don't wait for three seconds any...
blob
|
diff
|
raw
|
diff to current
2005-06-06
More work on merging with git-read-tree..
blob
|
diff
|
raw
|
diff to current
2005-06-06
git-read-tree: be a lot more careful about merging...
blob
|
diff
|
raw
|
diff to current
2005-05-31
git-resolve-script: use "git-apply --stat" instead...
blob
|
diff
|
raw
|
diff to current
2005-05-25
[PATCH] optimize git-resolve-script
blob
|
diff
|
raw
|
diff to current
2005-05-11
Merge ... http://members.cox.net/junkio/git-jc.git
blob
|
diff
|
raw
|
diff to current
2005-05-10
Introduce GIT_DIR environment variable.
blob
|
diff
|
raw
|
diff to current
2005-05-06
Merge of http://members.cox.net/junkio/git-jc.git
blob
|
diff
|
raw
|
diff to current
2005-05-05
Fix git-resolve-script.
blob
|
diff
|
raw
|
diff to current
2005-05-05
Split "git-pull-script" into two parts
blob
|
diff
|
raw
|
diff to current