repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Docs: minor git-push copyediting
2006-02-02
Fredr
i
k
K
u
i
vin
e
n
merge-recursi
v
e: Speed up commit g
r
a
p
h con
s
t
r
uction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fr
e
drik Kuivin
e
n
merge-recursi
v
e: Make use
o
f
p
r
o
vided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Ku
i
vinen
git-bran
c
h: Doc
u
ment
a
tion fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
merge-recursive:
I
mprove the error mess
a
ge printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
Kuivinen
git-wh
a
tch
a
nged: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-log: Ad
d
us
a
ge string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuiv
i
nen
git-diff: Usage string clean
-
up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usage message
c
le
a
n
-
u
p, tak
e
#2
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivinen
N
e
w
t
est cas
e
:
C
riss-cross merg
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivine
n
New
t
est
c
a
s
e: merge with directory/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
d
r
ik Kuivinen
te
s
t-l
i
b
.
sh: Add new function,
t
est_e
x
pect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuivinen
git-merge:
E
xit with code
2 if
n
o strategy
was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
mer
g
e-r
e
cursive: Replace 'except:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kui
v
inen
merge
-
r
e
cursive: Use '~' instead of '
_
' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
re
d
r
i
k Kui
v
in
e
n
merge-rec
u
rsive:
A
dd copyright no
t
i
ce
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Ku
i
vinen
merge-recursive: Indent
the o
u
tp
u
t properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Kuivi
n
en
m
e
rge-recur
s
ive:
F
i
x
s
u
pport fo
r
branch name
s
conta
i
n
i
ng
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-recursive: Fix limited
outpu
t
of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
redri
k
Kuivin
e
n
merge
-
r
ecur
s
ive: Only print
rel
e
vant rena
m
e m
e
ss
a
g
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
e
dr
i
k
Kuivinen
[PATCH] Enable
and
fix support for base
l
es
s
merg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
drik Ku
i
v
in
e
n
[
PATCH] Te
a
ch git-ls-f
i
les
a
b
ou
t
'--' to d
e
note
en
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
drik Kui
v
inen
[P
A
TCH] Teach t
h
e
rec
u
rsive me
r
ge stra
t
egy about renam
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k
K
u
ivinen
[P
A
TCH] More descriptive message
s
for
c
onflic
t
c
a
ses
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] recursive-
m
er
g
e
:
Don't
print a s
t
ack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
nen
[PATCH]
U
se the 'die'
f
unction
w
he
r
e it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
C
H] Use a
temp
o
rary index f
i
le when we merge
t
he
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivi
n
en
[PATCH] Adjust git-merge-recursive
.
py
f
or the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivi
n
en
[PATCH] Don't out
p
u
t
'Automatic merge failed
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
Kuivinen
[PATCH]
Be m
o
re like the
'res
o
lve'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATCH] Rename the
'fredri
k
' merge st
r
ategy t
o
'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[PATC
H
]
Make the Progr
a
mError class printab
l
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redri
k
Kui
v
i
n
en
[PATCH] Make sure we die if w
e
d
on
'
t get
enou
g
h arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uiv
i
nen
[PATCH] Intro
d
uce a 'die' func
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
ri
k
Ku
i
v
i
nen
[PATCH
]
Exi
t
w
i
th
status
c
ode 2 if we get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kui
v
inen
[PATCH]
Fix
a
s
se
r
tion failure
wh
e
n merging
c
ommon ance
s
tors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH]
Make
git
-
apply understan
d
in
c
omple
t
e
l
ine
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree