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
Merge early part of 'sp/reflog' branch
2006-05-16
F
r
ed
r
ik Kuivinen
U
p
date the documen
t
ation for git-merge
-
ba
s
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik Kuivinen
blame: Fix path pruning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
F
r
e
drik Kuivinen
Makefile: Add TAGS and tags
t
a
rgets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
r
edrik Kuivinen
b
l
ame:
Fix git-bl
a
me <directory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuivinen
blame: Nicer output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Ku
i
vinen
blame:
R
ename detecti
o
n
(
t
a
ke 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivi
n
en
rev-lib:
Mak
e
it e
a
sy to do rename tracking (take
2
)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredr
i
k
Kuivi
n
e
n
M
ake it po
s
sible to not clobber object
.
util in s
o
rt
_
in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik K
u
iv
i
nen
N
ice
r
ou
t
put from
'g
i
t'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
r
e
d
r
i
k Kuivinen
Remove trailing
dot after sh
o
rt description
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
d
rik K
u
i
vinen
Fix so
m
e incon
s
istencies
i
n the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fr
e
drik K
u
ivinen
git-blame: Use the same tests for git-blame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
F
r
edrik K
u
iv
i
nen
git-blame:
M
ake
the o
u
t
p
ut h
u
m
a
n re
a
dable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredr
i
k Kui
v
i
n
e
n
git-blame, tak
e
2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fred
r
ik
Kuivinen
A
dd git-bla
m
e, a tool for assigni
n
g blam
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Kuivinen
s/SHELL/
S
HELL_P
A
TH/ in
M
akefi
l
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
e
d
rik Kui
v
inen
merge-recursive: Spe
e
d
u
p
commit
g
r
a
ph construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik
K
uivinen
merge-recursiv
e
: M
a
ke use o
f
pr
o
vided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredr
i
k
K
ui
v
inen
git-branc
h
: Docum
e
ntation fixe
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
redrik
K
uivi
n
en
m
e
rge-re
c
ursive: Improve the er
r
or message printe
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fred
r
i
k Kuiv
i
nen
git-wh
a
tchanged
:
Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k Kuiv
i
ne
n
git-l
o
g:
A
dd
u
s
age s
t
ring
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-dif
f
: Usage s
t
r
i
ng clean-
u
p
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fr
e
d
r
i
k Kuivinen
Usage mess
a
ge cl
e
a
n
-u
p
, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Ku
i
vin
e
n
N
e
w
t
est case: Cris
s
-cr
o
ss merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New test case: merge with
d
ire
c
tory/fi
l
e confl
i
cts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
tes
t
-
l
ib
.
sh: Add ne
w
function, test_expe
c
t_c
o
de
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Ku
i
vinen
git-
m
erge: E
x
it wi
t
h
c
ode 2 if no 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
rsive: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
Kuivinen
mer
g
e-recursive: Use
'~'
i
nstead
o
f
'_'
t
o
separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
e
d
ri
k
Kuivinen
m
er
g
e-r
e
cursi
v
e:
A
dd
c
op
y
right notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik
K
u
i
vinen
merg
e
-recursive
:
I
n
dent the ou
t
put pro
p
e
r
ly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Kuivinen
m
e
rge-
r
ecursi
v
e: Fix s
u
pport for branch names
containi
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik Kuivinen
merge
-
recurs
i
ve: Fix limited out
p
ut of re
n
ame
m
e
ssa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuiv
i
n
en
mer
g
e-re
c
ursive: Only
p
rint relevant r
e
nam
e
message
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik
K
u
i
vinen
[PATCH] Enable
and fix
supp
o
rt for base
l
e
ss merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik K
u
ivinen
[P
A
T
C
H] T
e
ach git-ls-files
a
bout
'
--' to deno
t
e end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
ed
r
ik Kuivinen
[PATCH] Teach the rec
u
r
s
i
ve merge
s
trateg
y
a
bout
r
enames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
rik Kuivi
n
e
n
[PATCH
]
M
ore descript
i
ve mes
s
ages for conflict
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redr
i
k Kui
v
in
e
n
[PATCH] recursive-merge: Do
n
't
print
a
stack t
r
a
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH
]
Use t
h
e 'd
i
e
'
fun
c
tion
w
he
r
e it
i
s
a
p
prop
r
iate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PATCH] Use a temp
o
r
a
ry index file when we merge
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuiv
i
nen
[PATC
H
] Adjust git
-
merge-recursive
.
py for the new too
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edri
k
Kuivine
n
[PATCH] Don't o
u
tput 'Au
t
omatic me
r
ge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PATCH] Be more like the 'resolve' strat
e
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
K
uivin
e
n
[PATCH] Rename the 'fredrik' me
r
g
e strat
e
gy t
o
'recu
r
sive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Ma
k
e the Pr
o
g
ramError class printab
l
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivinen
[PATCH] Make sure
w
e
die if we don't
get enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k K
u
i
v
inen
[PATCH] I
n
tr
o
duc
e
a 'di
e
' f
u
n
ction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[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
Fred
r
ik Kuivine
n
[PA
T
CH] Fix assertion failur
e
when me
r
ging
c
omm
o
n ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
K
uivinen
[PA
T
C
H]
M
ake git-a
p
ply u
n
d
erstand
i
ncompl
e
te lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree