repo.or.cz
/
git
/
repo.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Use a temporary index file when we merge the common ancestors.
2005-09-13
F
re
d
rik Kuivinen
[PATC
H
] Use
a
temporary index file
when we
merge
t
he
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATCH] A
d
j
u
st git-merge-
r
e
cursive
.
py for
t
he ne
w
t
o
o
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edr
i
k Kuiv
i
ne
n
[
PATC
H
]
D
on't output 'Automatic merge
f
ailed,
.
.
.
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik K
u
ivinen
[PATCH] Be m
o
re l
i
ke
t
h
e
'
resolve' st
r
at
e
gy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[
P
ATCH]
Define relative
.
git/obj
e
cts/
i
nfo/alternates
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Detect
ls-r
e
m
ote failu
r
e
properly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivinen
[PATCH] Rename the '
f
r
e
drik' mer
g
e strategy
t
o 'recursive'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
a
n
o
F
ix off-by-one error in git-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Propaga
t
e err
o
r
s
from f
e
tch-pack
c
or
r
ec
t
l
y
to git-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Fix CDPATH pro
b
lem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
ni
o
C Hamano
Documen
t
gi
t
-grep 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
[PAT
C
H] Make '
g
it checkout' a
bit
m
o
re
f
orgiving when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C
H
aman
o
[
PATCH
]
Omit patc
h
es t
h
a
t have alre
a
dy been merged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Hors
t
von Brand
[PATCH] There a
r
e several undocumented dependen
c
ies
commit
|
commitdiff
|
tree
2005-09-13
Linus Torvalds
Impr
o
v
e
"gi
t
grep"
f
lags h
a
n
dling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik
K
u
i
v
inen
[PATCH] Make th
e
P
rogramError cla
s
s pri
n
table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
M
a
k
e sure we die if we
don't get e
n
oug
h
arguments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uiv
i
nen
[P
A
T
C
H]
I
ntroduce
a
'die
'
f
u
nction
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik
Kuivi
n
en
[P
A
TCH] Ex
i
t w
i
th status
c
ode
2 i
f
we get an e
x
ception
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
ATCH] Fix assertio
n
f
ailu
r
e when merging
c
ommon a
n
cestor
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Ham
a
no
A
l
low
f
indi
n
g thing
s
t
h
at begin with a dash
i
n 'git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Lin
u
s Torvald
s
[
PA
T
CH] Add
"git g
r
e
p" helper
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Linus Torvalds
[PAT
C
H] Add note a
b
out IANA confirmation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
J
u
n
io C Hamano
Use
i
nt
i
nstead of socklen_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
H
e
rbert
X
u
[PATCH] Apply N -> A status c
h
ange i
n
diff-h
e
lper
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
martin
@
ca
t
alyst
.
.
.
[P
A
TCH] archimpor
t
- bet
t
er ha
n
dling of
t
emp dirs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
martin@catalyst
.
.
.
[PATC
H
]
a
rchimport - use GIT_DIR i
n
stead
o
f hardcoded
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
martin@catalyst
.
.
.
[PATC
H
] ar
c
himpor
t
-
u
pdate in
-
script
d
oco, opti
o
ns
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
martin@c
a
t
al
y
s
t
.
.
.
[PAT
C
H] archimport doc
u
mentation tidyup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
m
ar
t
i
n
@cat
a
lyst
.
.
.
[
P
A
TCH
]
a
r
ch
i
mport do
c
u
m
en
t
ation upda
t
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Ya
s
ushi SHOJI
[PATCH] Escape ascii
d
o
c's
b
uilt-in em-dash
replacement
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Qingning
H
uo
[PATC
H
]
F
i
x bu
f
fer overflow in
c
e_flush(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hamano
Add a new merge strategy by Fre
d
rik Ku
i
v
inen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
'git-merge': Document
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
ano
Use Daniel's
read-tre
e
in the merge strategy '
r
es
o
lve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Mu
l
ti-backend merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C H
a
mano
P
lug leak in Daniel's read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C H
a
man
o
[PATCH] Add debugging
h
el
p
for
c
ase #16 to read-tree
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
a
n
o
[
PA
T
CH]
Di
s
able debu
g
gi
n
g f
r
om read-t
r
ee
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Daniel Barkal
o
w
[PATCH]
D
o
cument the trivial
merge r
u
le
s
f
or
3(+mor
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
D
a
niel Barkalow
[PATCH] Re
w
rite re
a
d-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
D
a
n
i
el
Barkalow
[PAT
C
H] Add function to append to an object
_
list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Da
n
iel Bark
a
low
[
P
ATCH] Add a fu
n
ction f
o
r gettin
g
a
s
t
r
uct tr
e
e
for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hama
n
o
Fix 'g
i
t-sho
w
-branch --list <head>'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Add 'git bisect replay/log' d
o
cumentat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Ham
a
no
K
e
e
p bisectio
n
log so that it can be
r
eplayed later
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Juni
o
C
H
amano
F
i
x copy marking fr
o
m di
f
fcore-
r
ename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
m
a
r
tin
@
catalyst
.
.
.
[P
A
TCH
]
archimport -
a
dd merge detec
t
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Ju
n
io C Hamano
M
a
ke sure we have leading dir
e
ctor
i
es under refs/
{
heads
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Sven
V
e
r
doolaege
[PATCH]
D
ocumentation/repository-layout
.
t
x
t
t
ypo
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C H
a
mano
show-bran
c
h: --list and --inde
p
e
n
d
e
nt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
i
o
C Hamano
Retire suppor
t
for old environment v
a
riables
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Adj
u
st
.
gitignore for big rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Marco Roeland
[PAT
C
H] remove dupl
i
cate git-send-email-
s
cript
.
perl
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
j
dl@freescale
.
c
o
m
[PATCH] fix tut
o
rial ty
p
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
jdl
@
fr
e
esca
l
e
.
com
[
P
ATCH] Fi
x
tutor
i
al re
f
e
renc
e
to git-*-scripts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
Haman
o
Ignore datestamp-only cha
n
g
es when installing web
d
oc
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
Hama
n
o
S
quelc
h
`remo
v
al' message
f
rom 'git reset
-
-h
a
rd'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C Hamano
'build' scrip
t
s
before installing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Ju
n
io C
H
ama
n
o
S
how all merge-base
ca
n
didat
e
s
from show-bra
n
ch --m
e
rge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio C
H
a
ma
n
o
D
o
cumentation u
p
dates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
lars
.
doelle@
o
n-line
.
de
[PAT
C
H
]
g
it
-
daem
o
n -
-
in
e
t
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio C
H
amano
git --version tells which version o
f
git you hav
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Amos
Waterland
[PATCH] Do not c
r
e
ate bogus br
a
n
c
h
f
rom flag to git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Patrick Mauri
t
z
[PATCH] Portabilit
y
fix for Solaris 10/x86
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C H
a
mano
B
i
g
tool r
e
name
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
G
IT 0
.
9
9
.
6
commit
|
commitdiff
|
tree
2005-09-07
David_Kågedal
[PATCH] Simplify git
scrip
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
J
unio
C Hamano
Doc
u
mentat
i
on updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
A Large Angr
y
SCM
[PATCH] Docs for git-build-rev-
c
ache
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
A L
a
rg
e
Ang
r
y
SC
M
[PATC
H
] Do
c
s
for g
i
t-show
-
rev-cache
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
A Large
A
ngry SCM
[PA
T
CH] Docs fo
r
git-reset-scri
p
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
A La
r
ge Angry SC
M
[PATCH] Docs for
git-ch
e
cko
u
t-script
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio
C
Hamano
Docum
e
ntati
o
n updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio
C
Hamano
Flat
t
en tools/ directory to make bui
l
d procedur
e
simp
l
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hamano
mailinfo: b
a
r
f
and exist upon n
e
sted multi
p
art
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Ham
a
n
o
Merge branch 'master'
o
f
.
commit
|
commitdiff
|
tree
2005-09-06
R
ene Scharfe
[PATCH] Up
d
ate do
c
u
mentation
f
or git-get-
t
ar-co
m
mit-id
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
H
.
Peter Anvin
[
P
A
T
CH
]
git-cvsimport-
s
cript
:
handling of tags
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hamano
F
o
rmat fix f
o
r ascii
d
oc documenta
t
ion t
i
tles
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Junio
C Hamano
Merge branch '
m
a
s
ter' of
.
commit
|
commitdiff
|
tree
2005-09-05
Ju
n
i
o
C Ha
m
ano
Retir
e
git-clon
e
-d
u
mb-ht
t
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Ryan Ander
s
on
[PATCH] U
p
date documen
t
ation of
--compose t
o
git-
s
end
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Ryan Ander
s
o
n
[PATCH] Ma
k
e git-send
-
e
m
ail
-
s
c
ript ignor
e
some unnecessary
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Ha
m
a
no
I
n
s
tall archimport-s
c
ri
p
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Ju
n
i
o
C Haman
o
Mer
g
e b
r
anch 'm
a
ster'
o
f
.
commit
|
commitdiff
|
tree
2005-09-04
Junio C Ham
a
no
A
dd copy/rename ch
e
ck for
g
it-apply
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
J
unio C H
a
mano
Add a link from u
p
date-ser
v
e
r
-i
n
f
o documentation to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH] Make git-apply under
s
tand incomp
l
ete lin
e
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Ha
m
ano
git-applymbox: fix
'-c'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Martin La
n
ghoff
[PATCH] archimpo
r
t:
avoid
committing on an Arc
h
tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Martin La
n
ghoff
[PATCH] arch
i
m
p
ort aut
o
d
e
tec
t
s i
m
p
ort status, s
u
pports
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Sergey Vl
a
sov
[PATCH]
NUL
terminate
t
h
e
ob
j
ect data i
n
pat
c
h
_
delta()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
P
e
ter
H
agervall
[PATCH]
P
ossible cleanups
for local-pull
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Pa
o
lo
'Blaisorblade
.
.
.
[
P
ATCH]
D
oc: replace read
-
cache with git-read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-03
Jun
i
o C Hamano
D
o
cumen
t
hooks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Juni
o
C Hamano
Merg
e
branch '
m
aster' of
.
commit
|
commitdiff
|
tree
2005-09-02
Juni
o
C
Ha
m
an
o
Menti
o
n post-update
when we first tal
k
a
bo
u
t publishing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Junio C
Hamano
scripts
:
equality te
s
t
'==' is not por
t
able
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
J
u
nio C H
a
mano
git-checkout-scrip
t
: Re
m
ove unne
c
essar
y
v
a
r
i
a
ble
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next