repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add the simple scripts I used to do a merge with content conflicts.
2005-04-17
Petr
B
a
udis
[
PATCH] Fix +x-related sho
w
-diff
f
alse
p
osi
t
ives
Signed-off-by:
Petr Baudis
<pasky@ucw.cz>
commit
|
commitdiff
|
tree
2005-04-13
Petr Bau
d
is
[PATCH]
C
h
ang
e
diff-tree outpu
t
fo
r
mat
Signed-off-by:
Petr Baudis
<pasky@ucw.cz>
commit
|
commitdiff
|
tree
2005-04-13
Petr Baudi
s
[PA
T
CH] dif
f
-tree usage
Signed-off-by:
Petr Baudis
<pasky@ucw.cz>
commit
|
commitdiff
|
tree
2005-04-13
Petr B
a
udi
s
[
P
ATCH] n
s
ec por
t
abili
t
y
Signed-off-by:
Petr Baudis
<pasky@ucw.cz>
commit
|
commitdiff
|
tree
2005-04-13
P
e
t
r
Baudis
[PATCH] Consoli
d
ate the
error
h
and
l
ing
Signed-off-by:
Petr Baudis
<pasky@ucw.cz>
commit
|
commitdiff
|
tree
2005-04-13
Petr Baudi
s
[PATCH] Make nsec c
h
ecking optional
Signed-off-by:
Petr Baudis
<pasky@ucw.cz>
commit
|
commitdiff
|
tree
2005-04-13
P
e
tr Baudis
[PATCH] SHA1 naive collisio
n
che
c
ki
n
g
Signed-off-by:
Petr Baudis
<pasky@ucw.cz>
commit
|
commitdiff
|
tree
2005-04-13
Petr B
a
udis
[PATCH
]
l
s-tree for listi
n
g
trees
Signed-off-by:
Petr Baudis
<pasky@ucw.cz>
commit
|
commitdiff
|
tree
2005-04-13
Pe
t
r Baudi
s
[
PATCH
]
Corre
c
t s
h
ow-diff output for d
e
leted files
Signed-off-by:
Petr Baudis
<pasky@ucw.cz>
commit
|
commitdiff
|
tree
2005-04-13
Petr Bau
d
is
[PATCH] Sile
n
t flag for show-di
f
f
Signed-off-by:
Petr Baudis
<pasky@ucw.cz>
commit
|
commitdiff
|
tree
2005-04-12
Petr Baudis
[
P
ATCH] Fix
a crash
w
h
en doing rev-
t
ree
Signed-off-by:
Petr Baudis
<pasky@ucw.cz>
commit
|
commitdiff
|
tree