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
Documentation: stdout of update-hook is connected to /dev/null
2005-12-16
F
r
edrik Kuivinen
git-whatchanged: Add
usage st
r
ing
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fred
r
ik Kuivinen
git-lo
g
: Add usage strin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k K
u
ivinen
git-diff: Usage string clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik K
u
ivinen
U
sage
m
essage c
l
ean-u
p
, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivin
e
n
Ne
w
test case:
C
riss-cr
o
ss merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
inen
New test case:
m
er
g
e w
i
th d
i
r
e
ctory
/
file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edr
i
k Kuivinen
test-lib
.
sh: Add new function
,
t
e
st_expect
_
code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
inen
g
it-me
r
ge
:
Exit with code 2
i
f
n
o strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredri
k
Kuivinen
merge-re
c
u
r
s
iv
e
: Replace '
e
xcept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kui
v
inen
merge-
r
ecursive: Use '~' instead of '_
'
to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
mer
g
e-re
c
ursive
:
Ad
d
copyrigh
t
notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Kuivinen
merg
e
-recurs
i
ve: Indent the outpu
t
properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kui
v
inen
merge-
r
ecursive: Fi
x
support for branch names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik K
u
ivinen
me
r
ge-
r
ecursive: Fix
l
imited
outpu
t
of
rename
m
ess
a
ge
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge-recursive: Only
p
rint
relevant
r
ena
m
e mes
s
a
ge
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
e
drik Kuivinen
[PATCH] Enable and fi
x
support for base less merg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kui
v
inen
[PA
T
CH] T
e
ach
git-
l
s-fil
e
s about '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teach t
h
e recursiv
e
merge strategy
about
re
n
a
m
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
Kuiv
i
nen
[PATCH] M
o
re desc
r
i
ptive me
s
sages for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivi
n
en
[
P
A
TCH] recurs
i
ve-merg
e
:
Don't print a s
t
ack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
K
uivine
n
[
PATCH] Use
t
he
'die'
f
uncti
o
n where it is a
p
pro
p
riate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATCH]
U
s
e
a
t
e
mp
o
rary index
fil
e
when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
in
e
n
[PAT
C
H] Adjust
g
it-mer
g
e-recursive
.
py for
the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
rik Kuivinen
[PAT
C
H] Don't ou
t
put 'A
u
toma
t
ic merge fail
e
d,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Be more like the 'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuiv
i
n
e
n
[PAT
C
H] Rename the
'
fredrik
'
merge strategy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
d
r
i
k Kuivi
n
en
[PAT
C
H] Make the Progr
a
mError class
pri
n
table
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[
PATCH
]
Ma
k
e sure we die if we
d
o
n
't
g
et enough
a
rgu
m
ent
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Introduce a 'die' func
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[PATCH] Exit with status
code
2
if we get a
n
exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivine
n
[PATCH] Fix assertion fa
i
l
ure whe
n
merging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredri
k
Kuivinen
[
P
ATCH] Make git
-
appl
y
understand inc
o
mple
t
e lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree