repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add an Emacs interface in contrib.
2006-02-14
F
r
edrik Kuivine
n
s/S
H
ELL/SHELL
_
PATH/ in Ma
k
e
f
ile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
e
d
rik Kuivinen
merge-
r
ecur
s
i
ve
:
Speed
u
p commit graph c
o
nstruct
i
on
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge-recursive: Make us
e
of
provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik K
u
ivinen
git-branch: Doc
u
m
en
t
ation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fr
e
drik
K
uiv
i
nen
me
r
ge
-
recursive: Im
p
rove
the error message pr
i
nted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
K
uivi
n
en
git-whatchanged: Add usage strin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik
K
uivi
n
en
git-log: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuiv
i
nen
git-diff
:
Us
a
ge str
i
ng clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fred
r
i
k Kui
v
i
nen
Us
a
ge message clean-u
p
, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivine
n
New t
e
st ca
s
e: Criss-cros
s
me
r
g
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik K
u
ivi
n
e
n
New test case: merge with dir
e
c
t
ory/
f
ile c
o
nflic
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivinen
t
est-
l
ib
.
sh: Add new function,
t
e
s
t
_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
dr
i
k Kuivinen
git-merge: Exit
w
ith cod
e
2 if no
strat
e
gy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fred
r
ik Ku
i
vinen
me
r
ge-recursive
:
Replac
e
'
e
xcept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
m
er
g
e-re
c
ursive: Use '~' instead of '
_
'
to s
e
par
a
te
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k
K
uivinen
merge-
r
ec
u
rsi
v
e: Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik Ku
i
vine
n
m
erge-r
e
cursive: Indent the out
p
ut proper
l
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredri
k
Kuiv
i
nen
merge-recur
s
iv
e
: Fix support fo
r
branch
name
s
con
t
aining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik
K
u
ivine
n
merge-recurs
i
ve: Fix limit
e
d output of rena
m
e me
s
sage
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fre
d
rik Kuivinen
m
e
rge-recursive:
Only prin
t
r
e
l
e
v
ant
rena
m
e m
e
ssages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredri
k
Kuivinen
[PA
T
CH] Enab
l
e
and fix supp
o
rt for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivin
e
n
[PATCH] Teach git-ls-files abou
t
'--' to denote
end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
r
ik Ku
i
vin
e
n
[PATCH] T
e
ac
h
the recur
s
ive mer
g
e strategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik K
u
ivinen
[PAT
C
H] More d
e
scripti
v
e messages for c
o
nflict
c
ases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik
K
uivinen
[PATCH] recursive-mer
g
e: Don't
p
r
i
n
t
a
s
t
ack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[
PATCH] Use t
h
e 'd
i
e' func
t
i
o
n
where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATC
H
]
U
se
a
temporary inde
x
file when w
e
m
erge th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PAT
C
H] Adjust gi
t
-
m
erge-recursiv
e
.
py
for th
e
n
e
w tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
K
uivinen
[
PATCH] Don't output 'Automat
i
c me
r
ge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
Kuivinen
[PATCH] Be more like the 'resolve'
s
tr
a
tegy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATC
H
] Rename
t
he
'
fredrik' merge
strategy
to 're
c
u
r
sive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make the
ProgramErro
r
c
lass
p
r
i
n
tabl
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[
PATCH] Make su
r
e
we die i
f
we don't get enough argu
m
e
nts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vinen
[PATCH] Intro
d
uc
e
a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k
K
u
i
vin
e
n
[
PATC
H
] Exit with status code 2 i
f
we ge
t
an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
i
nen
[PATCH] Fix assertion
f
ailure when merging
c
ommon ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[
P
A
T
CH]
Make
git-app
l
y
u
ndersta
n
d in
c
omplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree