tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Leave merge failures in the filesystem
[git.git]
/
read-tree.c
2005-06-07
Linus Torvalds
git-read-tree: -u without -m is meaningless. Don't...
blob
|
commitdiff
|
raw
2005-06-07
Linus Torvalds
git-read-tree: make one-way merge also honor the "updat...
blob
|
commitdiff
|
raw
|
diff to current
2005-06-07
Junio C Hamano
[PATCH] read-tree: save more user hassles during fast...
blob
|
commitdiff
|
raw
|
diff to current
2005-06-06
Linus Torvalds
git-read-tree: some "final" cleanups
blob
|
commitdiff
|
raw
|
diff to current
2005-06-06
Linus Torvalds
git-read-tree: simplify merge loops enormously
blob
|
commitdiff
|
raw
|
diff to current
2005-06-06
Junio C Hamano
[PATCH] index locking like everybody else
blob
|
commitdiff
|
raw
|
diff to current
2005-06-06
Linus Torvalds
Fix off-by-one in new three-way-merge updates
blob
|
commitdiff
|
raw
|
diff to current
2005-06-06
Linus Torvalds
Three-way merge: fix silly bug that made trivial merges...
blob
|
commitdiff
|
raw
|
diff to current
2005-06-06
Linus Torvalds
git-read-tree: fix up two-way merge
blob
|
commitdiff
|
raw
|
diff to current
2005-06-06
Linus Torvalds
More work on merging with git-read-tree..
blob
|
commitdiff
|
raw
|
diff to current
2005-06-06
Linus Torvalds
git-read-tree: fix up three-way merge tests
blob
|
commitdiff
|
raw
|
diff to current
2005-06-06
Linus Torvalds
git-read-tree: be a lot more careful about merging...
blob
|
commitdiff
|
raw
|
diff to current
2005-05-20
Linus Torvalds
sparse cleanup
blob
|
commitdiff
|
raw
|
diff to current
2005-05-19
Alexey Nezhdanov
[PATCH] cleanup of in-code names
blob
|
commitdiff
|
raw
|
diff to current
2005-05-11
Petr Baudis
Fixed a leak in read-tree
blob
|
commitdiff
|
raw
|
diff to current
2005-05-01
Linus Torvalds
Add "get_sha1()" helper function.
blob
|
commitdiff
|
raw
|
diff to current
2005-04-28
Junio C Hamano
[PATCH] Rename and extend read_tree_with_tree_or_commit...
blob
|
commitdiff
|
raw
|
diff to current
2005-04-22
Linus Torvalds
Move "read_tree()" to "tree.c" to be used as a generic...
blob
|
commitdiff
|
raw
|
diff to current
2005-04-22
Linus Torvalds
Clean up and simplify read-tree a bit.
blob
|
commitdiff
|
raw
|
diff to current
2005-04-21
Linus Torvalds
Add support for a "GIT_INDEX_FILE" environment variable.
blob
|
commitdiff
|
raw
|
diff to current
2005-04-21
Junio C Hamano
[PATCH] Usage-string fixes.
blob
|
commitdiff
|
raw
|
diff to current
2005-04-21
Junio C Hamano
[PATCH] Teach read-tree about commit objects
blob
|
commitdiff
|
raw
|
diff to current
2005-04-19
Linus Torvalds
Make "read-tree" know how to do a "1-way merge".
blob
|
commitdiff
|
raw
|
diff to current
2005-04-19
Linus Torvalds
Make "read-tree" take the 'stat' information for a...
blob
|
commitdiff
|
raw
|
diff to current
2005-04-17
Linus Torvalds
Be much more liberal about the file mode bits.
blob
|
commitdiff
|
raw
|
diff to current
2005-04-16
Linus Torvalds
Make 'read-tree' do a few more of the trivial merge...
blob
|
commitdiff
|
raw
|
diff to current
2005-04-16
Linus Torvalds
Make "read-tree" merge the trees it reads by giving...
blob
|
commitdiff
|
raw
|
diff to current
2005-04-16
Linus Torvalds
Encode a few extra flags per index entry.
blob
|
commitdiff
|
raw
|
diff to current
2005-04-15
Linus Torvalds
Convert the index file reading/writing to use network...
blob
|
commitdiff
|
raw
|
diff to current
2005-04-13
Petr Baudis
[PATCH] Consolidate the error handling
blob
|
commitdiff
|
raw
|
diff to current
2005-04-11
Linus Torvalds
Rename ".dircache" directory to ".git"
blob
|
commitdiff
|
raw
|
diff to current
2005-04-11
Linus Torvalds
Fix stale index.lock file removal using "atexit()".
blob
|
commitdiff
|
raw
|
diff to current
2005-04-10
Linus Torvalds
Make "update-cache" a bit friendlier to use (and harder...
blob
|
commitdiff
|
raw
|
diff to current
2005-04-09
Linus Torvalds
Teach "fsck" and "read-tree" about recursive tree-nodes.
blob
|
commitdiff
|
raw
|
diff to current
2005-04-09
Linus Torvalds
Make "read-tree" read the tree into the current directo...
blob
|
commitdiff
|
raw
|
diff to current
2005-04-08
Linus Torvalds
Use "-Wall -O2" for the compiler to get more warnings.
blob
|
commitdiff
|
raw
|
diff to current
2005-04-08
Linus Torvalds
Make read-tree actually unpack the whole tree.
blob
|
commitdiff
|
raw
|
diff to current
2005-04-07
Linus Torvalds
Add copyright notices.
blob
|
commitdiff
|
raw
|
diff to current
2005-04-07
Linus Torvalds
Initial revision of "git", the information manager...
blob
|
commitdiff
|
raw
|
diff to current
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
