repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: Describe merge operation a bit better.
2005-11-20
Fredri
k
Kuivin
e
n
merge-recurs
i
ve: Replace 'except
:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive: Use '~' instead of '_' to se
p
a
rate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuiv
i
nen
merge-recursive: Add cop
y
righ
t
notic
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive: Inde
n
t the
output pr
o
pe
r
l
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivi
n
en
m
e
rge-recursive: Fix suppo
r
t f
o
r
branch name
s
c
o
ntaini
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
m
e
rge-
r
ecursiv
e
: Fi
x
limited output of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik
K
uivinen
merge-r
e
cursive:
O
n
l
y print rel
e
vant re
n
ame messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
e
dr
i
k Kuivinen
[
P
ATCH] Enable
a
nd
f
ix support
f
o
r
base less merg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PA
T
CH] Teach git-ls-
f
iles
about
'
--' to de
n
o
te end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
d
rik Kuivinen
[P
A
TCH]
T
each the recu
r
sive
merge st
r
ategy ab
o
ut renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
Kuivin
e
n
[PATCH] More descriptive messages f
o
r conf
l
ict case
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] recur
s
ive-merge: D
o
n't prin
t
a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH] Use the '
d
ie' function where it
is app
r
opria
t
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PATCH]
U
se a tem
p
orary index file wh
e
n w
e
m
erge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PAT
C
H] Adjust g
i
t-merge-recurs
i
ve
.
py for
t
he
new to
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivine
n
[PATCH] Don't
o
utput 'Autom
a
t
ic
merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivin
e
n
[
P
A
T
CH]
Be
m
ore
li
k
e t
h
e 'res
o
lve'
strate
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PATCH] Re
n
ame the '
f
r
e
drik'
mer
g
e
st
r
ategy to
'
recursive
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik
Kuivi
n
en
[
P
ATCH] Make the Program
E
rror class p
r
intable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[PATCH
]
M
ake sure we
die if we don't get enough
a
rguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH] Introduce a 'die'
f
unctio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
dri
k
Kuivinen
[PATCH] Exit with sta
t
us code
2 if we get an ex
c
epti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Ku
i
vine
n
[PATCH]
F
ix assertio
n
failure w
h
en merging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
K
uiv
i
nen
[PATCH] Mak
e
git-a
p
ply
u
n
der
s
tand incomplete lin
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree