repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make merge comment git-pull makes for an octopus a bit prettier.
2005-09-14
Ju
n
io
C
H
am
a
n
o
Make merge comment git-pull makes for an oc
t
opus
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
read-tree:
fix
b
ogus debugg
i
ng statement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
git
-
merge-recursive: Trivial RE fix
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
Ku
i
vinen
[PAT
C
H] Use the 'die' fu
n
ction where it is
a
pprop
r
iate
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH]
U
s
e a t
e
m
porary index fi
l
e when we
m
erge th
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Adjust git-merge-recursive
.
p
y fo
r
t
h
e new tool
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
dri
k
Kuivinen
[PATC
H
] Don't o
u
t
put 'Auto
m
atic merge failed,
.
.
.
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[
P
ATCH] Be more like the
'
re
s
olve' strate
g
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io
C Ha
m
ano
[PATCH]
Define
r
e
lative
.
git/objects
/
i
n
fo/alternates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C Hamano
D
etect
l
s-remote failure
p
roperly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATC
H
] Rename the
'fredri
k
'
m
erge stra
t
egy to 'recursive'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Fix
o
ff-by
-
one error in g
i
t-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C
Hamano
P
r
opagate errors from fetch-pac
k
correctl
y
to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ham
a
no
Fix
C
DPATH problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
Document git
-
gr
e
p a
n
d link it f
r
om the main git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PATCH] Make 'gi
t
checkout' a bit more forgiving when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C Ham
a
no
[PATCH]
O
mit patc
h
es that have already been
mer
g
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Hors
t
von
B
r
a
nd
[PATC
H
] There a
r
e several undo
c
u
m
ented dependencie
s
commit
|
commitdiff
|
tree
2005-09-13
Linus Torvalds
Im
p
rove "git grep"
f
l
a
gs handl
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[P
A
T
C
H] Make the ProgramError cla
s
s
pr
i
ntable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivinen
[PATC
H
]
Make sure we die if
we don't ge
t
enough
argu
m
ents
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivinen
[PATCH] Intro
d
uce a 'die' fu
n
ctio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
F
re
d
rik Kuivinen
[PATCH] Ex
i
t wi
t
h status code 2
i
f we get an exception
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik
Ku
i
vinen
[PATCH
]
Fix
a
s
sert
i
on failure when merging common ancestors
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio
C Hamano
Allow finding
t
hings t
h
a
t
begin with a dash in 'g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Linus Torvalds
[
PATCH] Add
"git grep" helper
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Li
n
us Tor
v
a
l
ds
[P
A
TCH] Add
no
t
e about IANA confirmati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Ju
n
io C
H
a
m
ano
Use i
n
t instead of sockl
e
n_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
H
erbert Xu
[PATCH] Apply N -> A s
t
atu
s
cha
n
ge in diff-helper
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@ca
t
al
y
st
.
.
.
[PATCH] archimport
-
bet
t
er
handling of
t
emp
d
irs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
mart
i
n@cata
l
yst
.
.
.
[PATCH] archimport -
use GIT_DIR instead of hardc
o
d
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@catalyst
.
.
.
[PA
T
CH]
archimp
o
rt - upda
t
e in-script doc
o
, options
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@catal
y
st
.
.
.
[PATCH] archi
m
port documentatio
n
tidyup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
marti
n
@c
a
taly
s
t
.
.
.
[P
A
T
CH]
a
rchimport doc
u
mentat
i
o
n up
d
a
te
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Yasus
h
i SHOJI
[PATCH] Escape asciidoc's built-in em-dash replacemen
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Qingni
n
g
H
uo
[
PATCH]
Fix buffer
overflow in ce
_
fl
u
sh
(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Hamano
Add a ne
w
merge strategy by Fredrik Kuivine
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C Hamano
'git-me
r
ge':
Documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
ano
Use Daniel's read-tree in the merge st
r
ategy
're
s
olve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
ano
Mult
i
-
backend merge d
r
ive
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Haman
o
Plug leak in Daniel
'
s read-t
r
ee
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
i
o C
H
a
mano
[PATCH]
Add
d
e
bug
g
ing help for c
a
s
e
#1
6
to re
a
d-tre
e
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C Hamano
[P
A
TCH] Disable de
b
ugg
i
ng f
r
o
m read-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Dani
e
l Barkalow
[PATCH] Doc
u
m
e
n
t
the trivial merg
e
r
u
les fo
r
3(+
m
o
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel
B
arkal
o
w
[
PA
T
C
H
] Rew
r
ite read-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel
B
ar
k
alow
[
P
ATCH]
A
dd fun
c
t
i
on to
a
ppe
n
d to a
n
object_list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel Bark
a
l
ow
[
P
ATCH] Add
a func
t
i
o
n for ge
t
ting
a
struct tree
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Fi
x
'git-show-branch
-
-
l
i
s
t
<he
a
d
>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Ad
d
'
g
it bisect re
p
l
ay/log' documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C H
a
mano
Keep bisecti
o
n
l
og so th
a
t it can be replayed later
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Fix cop
y
mark
i
ng f
r
om dif
f
core-re
n
ame
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
mart
i
n@cata
l
yst
.
.
.
[PATCH
]
arc
h
import - add merge dete
c
tio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Ha
m
ano
Make sure we have
l
eading director
i
es under re
f
s/
{
heads
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Sv
e
n Verdoolae
g
e
[
PATCH] Documentat
i
on/repository-lay
o
u
t
.
txt ty
p
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
show-bran
c
h:
-
-list and -
-
independent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Reti
r
e
s
up
p
ort for old en
v
ironment variab
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Ad
j
us
t
.
gi
t
ignore for big
renam
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Marco
R
oeland
[
PA
T
CH] remove duplicate g
i
t-sen
d
-email-script
.
perl
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
jdl@freescale
.
com
[PATCH
]
fix tutorial typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
jdl@fre
e
scale
.
com
[PATCH] Fix tutori
a
l
r
eference to git-
*
-scrip
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C Haman
o
Ignore datestamp-o
n
ly changes when instal
l
i
n
g webdoc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o
C
Hamano
S
q
uelch `removal' messa
g
e
f
rom 'git reset --hard'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Ham
a
no
'bu
i
ld' scrip
t
s
before insta
l
ling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Ha
m
a
n
o
Show al
l
merge-
b
ase c
a
ndidate
s
f
r
om show-bran
c
h --merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Ju
n
io C H
a
mano
Documentation upd
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
lars
.
doelle@on-line
.
de
[PAT
C
H]
g
i
t
-
d
aemo
n
--inetd
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C
Hamano
git --
v
ersion tel
l
s whic
h
versio
n
of git you have
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Amo
s
Waterlan
d
[
PATCH] Do not
c
r
eate bogus bra
n
ch from flag
t
o
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Patrick Mauritz
[PATCH]
P
orta
b
i
lity fix for So
l
ari
s
1
0
/x8
6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C
Hamano
Big tool rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Juni
o
C
Hamano
GIT 0
.
99
.
6
commit
|
commitdiff
|
tree
2005-09-07
Da
v
id_Kågedal
[PATCH] Simplify
g
it script
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
J
u
nio C Hamano
Do
c
u
m
entat
i
on u
p
dates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A La
r
g
e Angr
y
S
CM
[PATCH] Do
c
s for gi
t
-
b
ui
l
d-rev-cache
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large A
n
gry SCM
[PATCH
]
Do
c
s for git-
s
how
-
rev-cache
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large A
n
gry SCM
[PATCH]
D
o
cs
for git-reset-s
c
ript
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large
Angry SCM
[PA
T
C
H
] Docs for
g
it-checko
u
t-script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hama
n
o
Docum
e
nt
a
tion
updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Juni
o
C Hama
n
o
Flatt
e
n tools/ direc
t
ory to
make bu
i
ld procedure sim
p
l
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
J
u
n
io C Hamano
mailinfo:
b
arf and exist upon nested multip
a
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hamano
Merge branch
'
master' of
.
commit
|
commitdiff
|
tree
2005-09-06
Rene Scharfe
[PATCH] Update d
o
cumenta
t
ion
for git-get-tar-commit-
i
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
H
.
P
e
ter An
v
in
[PAT
C
H] git-c
v
simport-s
c
ript:
handling of tags
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Jun
i
o C
H
amano
For
m
at
fix
for asciidoc doc
u
men
t
a
t
ion titles
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
J
u
nio C
H
a
m
a
no
Me
r
ge branc
h
'm
a
ster
'
o
f
.
commit
|
commitdiff
|
tree
2005-09-05
Junio
C
H
aman
o
R
e
tire g
i
t-clo
n
e-dumb
-
http
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
R
yan Anderson
[P
A
TC
H
]
Update documentati
o
n of --
c
om
p
o
se
t
o
g
it-
s
end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
R
yan
And
e
rson
[PATCH] Make git-send-e
m
ail-script
ignore some unnece
s
s
a
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Install a
r
ch
i
mport-
s
cript
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
J
un
i
o C
H
a
mano
Merge branch
'master' o
f
.
commit
|
commitdiff
|
tree
2005-09-04
Jun
i
o C Hamano
A
d
d copy/rename check fo
r
git-
a
pply
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Ju
n
io C Ha
m
ano
Add a link
from upd
a
te-
s
e
rver-info docu
m
e
nt
a
tion to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH]
M
ake git-apply understand inc
o
mplete lines
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
J
u
nio C Hama
n
o
g
i
t-applym
b
ox: fix '-c'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Martin Langhoff
[PATCH]
a
rc
h
import:
a
void c
o
mmitting on an A
r
ch tag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Martin Lan
g
hoff
[
P
ATCH] archi
m
p
o
rt a
u
t
od
e
tects im
p
o
rt
sta
t
us, s
u
ppo
r
ts
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
S
e
r
g
ey Vlasov
[PATCH]
N
UL terminat
e
t
h
e object data in
p
atch_delt
a
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Pet
e
r Hagervall
[PATC
H
] Pos
s
ible cl
e
a
n
ups for loc
a
l-pul
l
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Paolo 'Blaisorblad
e
.
.
.
[PATCH] Do
c
:
r
e
place read
-
cac
h
e with git-read-tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-03
Junio C Haman
o
Document ho
o
ks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next