repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Don't output 'Automatic merge failed, ...'
2005-09-13
F
redrik Kuivi
n
en
[PATCH] Don't output 'Automatic merge failed,
.
.
.
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
ui
v
inen
[P
A
T
C
H] Be mo
r
e like the 're
s
o
l
ve' strat
e
gy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C
Hamano
[PATCH] Define relative
.
git/objects/info/alt
e
rnates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C
Ha
m
ano
Detect l
s
-remote failu
r
e prop
e
r
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH
]
Ren
a
me th
e
'fre
d
rik' merge strat
e
gy to
'
rec
u
rsive'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Haman
o
F
ix off-by
-
o
n
e err
o
r in
g
i
t-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Ham
a
no
Pro
p
agat
e
errors
f
rom fet
c
h-pac
k
correctly to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C H
a
mano
F
ix CDPATH problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
ni
o
C
H
amano
D
o
cum
e
n
t
git-gre
p
and link it from the main
git(7
)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[
PATCH] Ma
k
e 'git checkou
t
' a bit more forgiving
when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C
Hamano
[
P
A
TCH] Omit patches that ha
v
e already been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Ho
r
st von Bra
n
d
[PATCH] There are several undocu
m
ented dep
e
ndenc
i
es
commit
|
commitdiff
|
tree
2005-09-13
L
i
n
u
s Tor
v
alds
Improve "git grep" flags ha
n
dling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PA
T
CH] Ma
k
e the ProgramError class
printable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make
sure we die if
w
e don't get enough a
r
guments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuiv
i
nen
[
PA
T
C
H]
I
n
t
r
od
u
ce a 'di
e
' function
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Ex
i
t with sta
t
us
code 2 if we get an exc
e
ption
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik
K
uivinen
[PATCH] Fix assertion failu
r
e
when merging common ancestors
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Allow fin
d
ing thing
s
that beg
i
n wi
t
h a da
s
h in 'git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Linus Torvalds
[PATCH
]
Add
"
git gre
p
" helper
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Lin
u
s Torvald
s
[P
A
TCH] Add
note
abo
u
t IAN
A
co
n
firmation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Jun
i
o C Hamano
Us
e
i
nt
i
nstead of sock
l
en_
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Her
b
ert Xu
[PATCH] Apply
N
->
A sta
t
us change in
d
iff-helper
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@cat
a
lyst
.
.
.
[PATCH
]
arch
i
mport - b
e
tt
e
r ha
n
dling of temp dirs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@catalys
t
.
.
.
[P
A
T
C
H]
archi
m
p
o
rt -
u
se GIT_DIR inst
e
ad
of har
d
coded
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@catalyst
.
.
.
[PATCH] archim
p
ort - update in-script doco, options
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
m
artin@cataly
s
t
.
.
.
[PA
T
CH] archi
m
po
r
t
d
ocumentation tidy
u
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@catalyst
.
.
.
[
PATCH] archimport do
c
u
m
entation
updat
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Y
asu
s
hi
SHOJ
I
[PATCH
]
Esc
a
pe asci
i
doc's bui
l
t-in
em-dash replac
e
ment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Qingning
H
u
o
[
P
AT
C
H] Fix
b
uffer over
f
low in
ce
_
flush
(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
io C Hamano
Add
a new merge
s
t
rateg
y
by Fredr
i
k Kuivin
e
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Hamano
'git-merge': Documenta
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
H
aman
o
Us
e
Daniel's read-tree in the merge strate
g
y 'reso
l
ve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o
C Hamano
Multi-ba
c
kend
m
erge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ham
a
no
P
lug leak in Dan
i
el's read-
t
re
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
ano
[
PATCH] Add debugging help for
c
as
e
#16 to read-tr
e
e
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[PATC
H
] D
i
sabl
e
debuggin
g
from rea
d
-
t
ree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel Barkalow
[
PATCH] Document
t
h
e trivi
a
l
m
er
g
e rules
f
or 3(+more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel Barka
l
ow
[
PATCH] R
e
wr
i
te read-t
r
ee
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel Barkalow
[
P
ATCH] Add function
to append
t
o an
object_lis
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Danie
l
Barka
l
ow
[
PAT
C
H] Ad
d
a function for ge
t
ting a struct tree f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
uni
o
C
Hamano
Fix 'git-
s
how-branch -
-
l
ist
<head
>
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
uni
o
C Haman
o
Add 'git bisect replay/log
'
doc
u
m
e
ntati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C
H
amano
Keep bisection l
o
g so
t
h
a
t it can be replayed lat
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
u
nio C
Ha
m
ano
Fix copy ma
r
k
ing f
r
om diffcore-rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
martin@cata
l
yst
.
.
.
[
PATCH] a
r
chimpo
r
t -
add merge detection
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Make sur
e
we
have leadi
n
g
d
irectories under ref
s
/{heads
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Sve
n
Ve
r
d
oolaege
[PA
T
CH]
Documentation/repository-l
a
yout
.
txt
t
ypo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C H
a
mano
show-bra
n
ch:
-
-list a
n
d -
-
independent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
unio C Hamano
Ret
i
re su
p
port for old
e
nviro
n
ment variab
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
Hama
n
o
Adjust
.
gitignore for
big rena
m
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Marco Roeland
[P
A
TCH
]
remo
v
e duplicat
e
git-send-em
a
il-s
c
r
i
pt
.
perl
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
j
dl@freescale
.
c
o
m
[PA
T
CH] fix tutorial typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
jdl@fr
e
escale
.
com
[
PATCH] Fix tutorial r
e
fer
e
nce to
g
i
t
-
*
-s
c
r
i
p
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
H
a
mano
I
g
nore d
a
tes
t
a
m
p-only chang
e
s when in
s
tall
i
n
g webdoc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io
C
Hamano
Squelch
`
removal' me
s
sag
e
f
r
o
m 'git reset --hard'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
u
nio C Hamano
'bui
l
d' scripts before inst
a
l
l
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Jun
i
o C Ha
m
an
o
Show all merge-base candidates from
s
h
ow-branch
-
-
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
J
un
i
o
C Hamano
Document
a
ti
o
n updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
l
ar
s
.
doelle@
o
n-
l
ine
.
de
[
P
ATCH] git-daemon --in
e
t
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
J
u
nio C H
a
mano
git --
v
ersion tel
l
s which version of
g
i
t you
have
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Amos Waterland
[
P
A
T
CH] Do
not create bogus branch
from flag to git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Patrick Mauritz
[PA
T
CH
]
Portability fix for Solar
i
s 10/x86
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C
Hamano
Big to
o
l r
e
name
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
GIT 0
.
99
.
6
commit
|
commitdiff
|
tree
2005-09-07
David_Kågedal
[PATCH] Simplif
y
git scrip
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Documen
t
a
t
i
on u
p
dates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large Angry SCM
[
P
ATCH] Docs fo
r
git-
b
u
i
ld-r
e
v
-ca
c
h
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large Angry SC
M
[PATC
H
]
Docs fo
r
gi
t
-show-rev-cache
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large A
n
g
r
y SCM
[PATCH] Docs for git-
r
eset-sc
r
ip
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A
Large Angry SCM
[PA
T
CH] Docs for git-checkout-
s
cr
i
pt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Documentation updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio
C Hamano
Flatt
e
n to
o
l
s
/ direc
t
ory t
o
m
a
ke
build
p
r
o
cedure simpler
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Ju
n
io C
H
a
m
ano
m
ailinfo
:
barf and exist upon nested multipart
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Ju
n
io C
H
ama
n
o
Me
r
ge branch '
m
aster' of
.
commit
|
commitdiff
|
tree
2005-09-06
Rene
Sch
a
rfe
[PATCH] Update
d
ocumenta
t
i
o
n
f
o
r
git-get-ta
r
-commit-id
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
H
.
Peter Anvin
[PATCH]
g
i
t
-
cvsimport-scri
p
t:
handling of tags
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Ju
n
io C Hamano
Fo
r
mat fix for asci
i
doc documentation title
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
J
unio C
H
ama
n
o
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-05
J
u
n
io
C Hamano
Retire git-clone-dumb-http
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Ryan Anderson
[
P
ATCH] Update d
o
cumentation
o
f --co
m
pose to g
i
t-send
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Ryan Anderson
[PATCH] Make git-send-email-script ignore some unnecessary
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Insta
l
l archimport-script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
J
u
nio C Hamano
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-04
Junio C
H
amano
A
d
d copy/rename
c
he
c
k for
g
it-a
p
p
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio
C
Hama
n
o
A
dd
a
lin
k
from updat
e
-server-in
f
o docu
m
ent
a
tion to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
F
re
d
r
ik Kuivinen
[PATCH
]
M
ake git-a
p
ply understan
d
incomplete line
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hamano
git-applymbox: fix '-c'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
M
a
r
t
in L
a
nghoff
[
PATCH] arch
i
mport:
a
void
com
m
itting on an Arch ta
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Martin Langhoff
[
P
ATCH] arch
i
mport autod
e
tects imp
o
r
t
status, supports
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Sergey Vlasov
[PATCH] NUL terminate th
e
objec
t
dat
a
in pat
c
h
_delta()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Peter Hagerval
l
[PATCH]
P
ossible cle
a
nu
p
s for l
o
cal-p
u
ll
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Paolo 'Bl
a
is
o
rblade
.
.
.
[PATCH] Do
c
: replace read-c
a
che with git-r
e
ad-tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-03
Juni
o
C Hamano
Doc
u
ment hooks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
J
u
nio C Hamano
Merge
branc
h
'
ma
s
ter' of
.
commit
|
commitdiff
|
tree
2005-09-02
Junio
C
Hamano
Mentio
n
pos
t
-update
w
h
e
n
we first
t
al
k
a
b
out
p
ublishing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
J
u
ni
o
C Hamano
scripts: equality
t
e
st
'
=='
is
not portable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
J
u
nio
C
Hamano
gi
t
-checkout-script:
Rem
o
ve unnec
e
ssary
v
ariable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio
C Hamano
Fix automerge message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Amos W
a
terlan
d
[PATCH] Explain
w
h
a
t
w
e
nt wrong
o
n update-cac
h
e of
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next