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
git.el: Portability fixes for XEmacs and Emacs CVS.
2006-03-02
Fredri
k
Kui
v
i
nen
g
it-blame, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fr
e
drik Kuivi
n
en
Add git-blame, a tool f
o
r
assigning
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fred
r
ik K
u
ivinen
s/SHELL/S
H
ELL_PATH/
i
n Mak
e
f
ile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik K
u
i
vinen
m
e
r
ge-recu
r
sive: Sp
e
e
d
up
c
o
m
mit graph constr
u
ction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
me
r
ge-recursive: Mak
e
us
e
of prov
i
ded ba
s
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredr
i
k Kuivinen
g
it-bran
c
h: Docu
m
entat
i
on
f
ixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fr
e
drik
Kuivinen
me
r
g
e
-re
c
ursive: Improve the err
o
r message pr
i
nted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fre
d
rik Kuivi
n
en
git-whatchang
e
d: A
d
d usage s
t
ring
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k
Kuivinen
git-log:
Add usage st
r
ing
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
red
r
ik Kuivi
n
en
git-diff: Usage string
clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fr
e
drik Kuivinen
Usag
e
message
clean-up, t
a
ke #2
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivin
e
n
New t
e
st case: Cri
s
s-
c
ross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivinen
New test ca
s
e: merge with dir
e
ctory/file co
n
flicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
nen
test-lib
.
sh: Add
n
e
w
function, test_expec
t
_
co
d
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-merge: Ex
i
t with code 2 if no strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
merge-recu
r
si
v
e: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik Kuivinen
merge-recursive:
Use '~' instead of '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Ku
i
vinen
m
erge-
r
e
cursiv
e
:
Add cop
y
right
n
o
t
i
ce
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Kuivinen
m
erge-recur
s
i
v
e: Ind
e
nt the output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredri
k
Kuivinen
merge
-
recursive
:
F
i
x
su
p
port for
b
ranch names
c
ontain
i
ng
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
redrik
K
uivinen
m
erge
-
recursive: Fix limited output of rename
m
essage
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
redr
i
k
K
u
i
vinen
merge-recursive:
O
nly
print relevant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
redri
k
Kuivinen
[PA
T
CH] Enable and
fix su
p
port for base le
s
s merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Ku
i
vinen
[PATCH] Teach git-l
s
-file
s
about '--
'
to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivin
e
n
[PATCH] Teac
h
th
e
recurs
i
ve merg
e
str
a
teg
y
abou
t
re
n
ames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
r
i
k Kuivin
e
n
[PAT
C
H] More descriptiv
e
messages
f
o
r
conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik Kuivine
n
[P
A
TCH]
recurs
i
ve-merge: Don
'
t print a s
t
ack
t
ra
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kui
v
inen
[PATCH] Use the 'die' function
w
here it
i
s
appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
d
rik Kuivin
e
n
[
P
ATCH] U
s
e
a tem
p
orary index file
when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[PATCH] Adjust g
i
t-merge-recursive
.
py f
o
r t
h
e
new t
o
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Ku
i
vinen
[PATCH] Don
'
t
o
utp
u
t 'Automatic
me
r
ge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[PATCH]
B
e more lik
e
th
e
'
r
esolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH]
R
ename the 'fredrik' mer
g
e strat
e
g
y
t
o
'
rec
u
r
s
i
v
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[PATCH]
Make
t
h
e ProgramErro
r
clas
s
pri
n
ta
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edri
k
Kuivine
n
[PATCH] Make sure we die if we don't get en
o
ugh arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[PATC
H
] Introdu
c
e
a '
d
ie' f
u
nctio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Ku
i
v
inen
[PATCH]
E
xit 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 Kuivinen
[PATCH] Fix assert
i
on failure
w
h
en mer
g
ing common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH] Ma
k
e git-apply under
s
tand
i
nco
m
pl
e
te lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree