repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
user-manual: reset to ORIG_HEAD not HEAD to undo merge
2007-02-23
Fredrik K
u
i
v
ine
n
F
i
x 'git commit -a' in a newly initialized repo
s
itory
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredrik Kuivi
n
en
Docum
e
ntation/
i
18n
.
txt: it is i18n
.
com
m
itencod
i
ng not
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
F
r
edri
k
Kuivinen
Rea
d
the config in rev-list
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-01-06
Fredrik
K
uivi
n
en
instaw
e
b: Nicer erro
r
message when the http daemon
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
Fredrik Kuivinen
b
lame:
Add --time to
produce raw t
i
me
s
tam
p
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fredrik Kui
v
inen
U
pdate the do
c
umen
t
ation
for git-m
e
rge-ba
s
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
F
redrik Kuivine
n
bl
a
me: F
i
x path p
r
uning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredri
k
Ku
i
vinen
Makefile: Add TAGS
a
nd ta
g
s
ta
r
g
e
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuivinen
blame: Fix git-blame <directory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik K
u
i
vinen
blame: Nicer output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
b
lame: Rename de
t
ection (take
2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fred
r
ik
K
uivinen
rev
-
li
b
:
Ma
k
e
it easy to do rename t
r
ac
k
ing (ta
k
e 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredri
k
Kuivinen
Ma
k
e it possible t
o
n
ot cl
o
bber objec
t
.
util in sort_in_top
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
drik Kuiv
i
nen
N
i
cer output from 'git
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Ku
i
v
ine
n
Remove trailing dot afte
r
short
d
e
scription
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Fix som
e
inconsistencies in
t
he
d
ocs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Kuivinen
git-blame: U
s
e the
same t
e
sts for git-
b
l
a
me
a
s for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik
Kuivi
n
en
gi
t
-blame: M
a
ke the output human re
a
dabl
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
F
r
edri
k
Kuivinen
git-blame, t
a
ke
2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
F
redrik
K
uivinen
Add gi
t
-blame, a
t
o
ol
for
a
ssigning blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredr
i
k Ku
i
vin
e
n
s
/S
H
ELL/SHELL_PA
T
H/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
mer
g
e-recur
s
ive: Speed up co
m
mi
t
graph
c
onst
r
uc
t
ion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fr
e
drik Kuivinen
merge
-
recursive: Make use o
f
provid
e
d
bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
git-branch: Documentation fix
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik K
u
ivinen
merge
-
recursive
:
Improve the error
message pr
i
nt
e
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
re
d
r
i
k
Kuivinen
git-wh
a
tch
a
n
ged:
Add usage st
r
i
ng
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivin
e
n
git-log: Ad
d
usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
e
d
rik Kuivin
e
n
git-
d
iff: Usage st
r
ing clea
n
-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
r
edrik Kuivine
n
Usage
m
e
s
s
a
g
e clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New
test case: Criss-cross
m
erge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
nen
Ne
w
te
s
t case: merge with di
r
ectory/file confl
i
cts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
test
-
lib
.
sh: Add
n
e
w func
t
ion, test_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
ine
n
g
i
t-me
r
ge:
Exit with code 2
i
f
n
o
strat
e
g
y
w
as
a
bl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
me
r
ge
-
r
ecursive
:
Repl
a
ce 'excep
t
:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuiv
i
nen
merge-recursi
v
e
:
Use '~' ins
t
ead of '_' to sepa
r
at
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-rec
u
rsive:
Add cop
y
right noti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
redrik Kui
v
inen
merg
e
-recur
s
ive
:
Indent the output pr
o
perly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
Kui
v
inen
merge-r
e
cursive: Fix support
for br
a
nch
names
c
o
ntaining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fred
r
ik Kuivinen
merge-re
c
ursive: Fix
li
m
it
e
d
ou
t
put of re
n
ame messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fred
r
i
k Kuivinen
mer
g
e-re
c
ursive: Only pri
n
t relev
a
nt re
n
am
e
me
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredr
i
k
K
u
i
vin
e
n
[PAT
C
H] Enable and f
i
x support fo
r
bas
e
les
s
me
r
g
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
rik
K
uivin
e
n
[PA
T
CH] Teach
git-ls-files a
b
out '--' to denote
end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kui
v
inen
[P
A
TCH]
T
each the
recurs
i
ve merg
e
stra
t
egy
abo
u
t
r
enames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kui
v
in
e
n
[
P
ATCH]
More
d
escript
i
ve me
s
sages
for
conflict c
a
ses
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivi
n
en
[PA
T
CH] recursive-merge:
Do
n
't pr
i
nt a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivin
e
n
[
P
ATCH] U
s
e the 'd
i
e'
fun
c
ti
o
n where it
i
s
a
ppro
p
riate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATCH] Use a te
m
porary index file
when we
merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[
P
AT
C
H] Adjust git-
m
e
rge-recursiv
e
.
p
y
for
t
he ne
w
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
v
i
n
en
[PATCH] Do
n
't ou
t
put 'Automatic merge fail
e
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivine
n
[PATCH] Be
m
ore l
i
ke the 'resolve
'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH
]
R
ename t
h
e 'fredrik' merge strate
g
y
t
o 'recurs
i
ve'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
nen
[PATC
H
] Make the
P
r
o
gram
E
rro
r
class prin
t
abl
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
M
a
ke sure we die
if
w
e don'
t
get
e
nough arg
u
ment
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
ATCH] Introduce a 'die' func
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuiv
i
n
en
[PATCH] Exit with sta
t
u
s
code 2 i
f
we g
e
t an
exceptio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[P
A
TCH] Fix assertion fail
u
re w
h
en merging
c
ommon an
c
estors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivi
n
en
[PATC
H
]
Make git-app
l
y under
s
tand incompl
e
te li
n
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree