repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/git-commit.txt: Add long options and -- to documentation.
2005-12-03
Fredrik K
u
ivinen
N
e
w
test cas
e
: Cris
s
-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivinen
New test ca
s
e: merge wit
h
directory/file
conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik K
u
ivinen
te
s
t-lib
.
sh: Add
n
ew function, test_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
i
k
Kuivin
e
n
git-me
r
g
e
: Exit with code 2 if no str
a
te
g
y was
a
ble
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fr
e
drik Kui
v
i
nen
mer
g
e-recurs
i
ve: Replace '
e
xcep
t
:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
Kuivinen
me
r
ge-r
e
cursive: Use
'
~' instead
o
f '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edri
k
Kuivinen
merge-re
c
ursive: Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
me
r
ge-recursive:
I
nden
t
the output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-r
e
cursive
:
F
ix support for branch names containin
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fred
r
ik
Kuivinen
m
erge-re
c
ursive: Fix limite
d
output of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuiv
i
nen
merge-recursive: O
n
ly
p
rint relevant re
n
am
e
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[
P
ATCH] Enable
a
n
d fi
x
support for base les
s
m
e
rg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k Kuivinen
[
PA
T
CH] Teach
git-ls-files a
b
o
u
t
'--' to
denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Kuivinen
[P
A
T
C
H] Teach
the rec
u
rsi
v
e merge
s
trate
g
y ab
o
u
t renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
r
ik Kuivinen
[PATCH] More descri
p
t
ive message
s
for conf
l
ic
t
c
a
ses
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik Kuivin
e
n
[PATCH] recursive
-
merge: Don'
t
prin
t
a stac
k
t
r
ace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
i
k Kuivi
n
en
[PATCH] Use the 'die' functi
o
n wher
e
it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Use a temporary index f
i
le when we
merge
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH]
Adjust git-merge-recursive
.
py
for the
n
ew tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PATCH] Don'
t
outpu
t
'Automatic merge f
a
iled,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Ku
i
vinen
[PATCH]
B
e mo
r
e like the 'resolve'
s
trate
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuiv
i
ne
n
[PATCH] Ren
a
me the 'fredrik' merge
s
t
r
ateg
y
to
'
recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
nen
[P
A
TCH]
Make the ProgramError
c
las
s
p
r
inta
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuiv
i
nen
[PATCH]
M
ake sure we di
e
if we d
o
n't get enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivin
e
n
[PATCH]
I
ntrod
u
ce a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivine
n
[PATCH] Ex
i
t
with status code
2
if
w
e
g
et
a
n
ex
c
e
p
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivinen
[PATCH] Fix
assertion failur
e
when merging c
o
mmon ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredri
k
Kuiv
i
nen
[PATCH] Make git-app
l
y
u
nd
e
r
s
ta
n
d
i
ncom
p
lete l
i
n
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree