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
Fall back to three-way merge when applying a patch.
2005-10-06
Ju
n
io C Hamano
Fall back to
t
h
r
e
e-way mer
g
e
when applying
a
pat
c
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-06
Linus Torvalds
A
llow "-u"
f
lag to
t
ag signing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-06
A
lex R
i
esen
Do not requir
e
ls-rem
o
t
e
to be run
i
nside a gi
t
rep
o
sitory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-06
Juni
o
C Hamano
git-sh
o
rt
l
og
:
make the
m
ailmap configurable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
Junio C
H
a
mano
Me
r
g
e branch 'fixes'
commit
|
commitdiff
|
tree
2005-10-05
Jon
a
s
Fonse
c
a
F
ix usa
g
e of car
e
ts
i
n git-rev-parse(1)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
Jun
i
o C
Hamano
c
l
o
ne-pack: use
crea
t
e_symref()
i
n
st
e
ad of
raw syml
i
nk
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
C
hris
t
ian Me
d
e
r
Some typos a
n
d light editing of
va
r
ious manp
a
ges
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hamano
upload-pac
k
:
Do
not
chok
e
o
n
too many heads reques
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
S
a
n
ti
_
Bé
j
ar
[P
A
TCH]
Q
uote t
h
e mi
s
sing GIT_DIR
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
Jonas Fonseca
[P
A
T
CH] Fix symbo
l
ic ref val
i
datio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
Alex Ries
e
n
[PA
T
C
H
] hold_index_file_for_update should not un
l
i
n
k
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
J
u
nio C Ham
a
no
Fix diff-fil
t
er All-Or-None ma
r
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
Jun
i
o C Hama
n
o
Record
which t
r
e
e
the p
a
tch applies to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
J
u
nio C Hama
n
o
git-applyp
a
tch:
cleanup
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hamano
git-apply: retire
u
nused/unimplemen
t
ed --no-mer
g
e fl
a
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
Jun
i
o C
Ha
m
ano
git-
a
pply: allow operati
n
g in s
p
arsely populated
w
orking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hamano
Return error when not checki
n
g out an entry due to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hamano
Merge bran
c
h '
f
ixes'
commit
|
commitdiff
|
tree
2005-10-05
Junio C
Hamano
Add missing d
o
cu
m
entation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-04
Junio C
H
a
mano
Remove useles
s
use
o
f se
d
in git-
f
ormat-pa
t
c
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-04
Ju
n
i
o C Hama
n
o
Leave
a
n empty
l
in
e
be
t
ween log and
sign-off
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-04
Junio C Hama
n
o
R
emove unused
e
xternal-di
f
f script
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-04
D
a
n
i
e
l
Barkalow
[PATCH] Lim
i
t the nu
m
be
r
of requests
outstandi
n
g in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-04
Junio C Hamano
O
n
Cygwin,
use
symbolic re
f
, no
t
a symbolic link, t
o
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-04
Junio C
H
a
m
ano
Mer
g
e branc
h
'fixes'
commit
|
commitdiff
|
tree
2005-10-04
Junio C Haman
o
Avoid compiler warni
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-04
J
u
nio C Hamano
Make sure get_sha1 does not ac
c
ept ambi
g
uous sh
a
1 pre
f
i
x
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-03
Junio C Hamano
Merge b
r
anc
h
'fixe
s
'
commit
|
commitdiff
|
tree
2005-10-03
Junio C Hamano
gi
t
-pull: do not barf on -a flag meant for gi
t
-fet
c
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-03
Jonas F
o
nseca
[PATCH]
Rando
m
doc
u
men
t
ation f
i
x
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-03
Jun
i
o C Hamano
Error messa
g
e from ge
t
_sh
a
1() on ambiguo
u
s short SHA1
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik K
u
i
vin
e
n
[PATC
H
]
Enab
l
e
and fix support
for base less merges
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-03
Junio
C Hamano
Make sur
e
get_s
h
a1 does not acc
e
pt ambiguo
u
s sha1 prefix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-03
J
u
nio C Hamano
Fix minor
D
O
S
i
n
re
v
-list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Ha
m
ano
Post 0
.
99
.
8 mas
t
er branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Junio C H
a
man
o
GIT 0
.
99
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Eric W
.
Biederman
[PATCH] Upd
a
te git-clone docum
e
ntation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
J
u
nio C Hama
n
o
Handle real
l
y
trivial cas
e
inside git-merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Lin
u
s Torvalds
r
ead-tree:
-
-trivial
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Fredri
k
Ku
i
vin
e
n
[PATC
H
]
Teach
g
it-ls-files ab
o
ut '-
-
' to denote end
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
drik
Kuiv
i
nen
[PATCH] Teach the
r
e
cursive me
r
ge strategy
a
b
out renames
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Junio C
H
amano
read-
t
ree:
remo
v
e -
-
hea
d
option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Junio
C H
a
ma
n
o
C
ust
o
mi
z
e git
c
ommand for inst
a
llations that
l
ack certain
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Han Boetes
[
PATCH
]
git on Ope
n
B
S
D
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
L
i
nus Torvalds
[PA
T
CH
]
Re-instate index fil
e
wr
i
te optimization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Linus To
r
va
l
ds
[PAT
C
H]
B
e
t
ter erro
r
reporting for "gi
t
s
t
atus
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
More
p
or
t
a
b
ility
.
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
Add git-symbol
i
c
-
ref
commit
|
commitdiff
|
tree
2005-10-02
Jun
i
o C Hamano
U
s
e resolve_ref() to implement
rea
d
_re
f
(
)
.
commit
|
commitdiff
|
tree
2005-10-02
L
i
n
u
s Torval
d
s
[PATCH] Al
l
ow r
e
ading "s
y
mbolic refs" that point to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Junio
C
H
a
mano
Te
a
c
h
upd
a
te-ref about a
symbolic ref stored in
a
tex
t
file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Linus T
o
r
v
a
lds
[PATCH] git
fetch --tags
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
N
i
c
k
Hengeveld
[
P
A
T
CH] HTTP pa
r
tial transfer suppo
r
t fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Junio C
H
am
a
no
Update p
a
rti
a
l HTTP trans
f
ers
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Nick
H
engeve
l
d
[
P
ATCH] HTTP
p
a
r
tial tran
s
fer s
u
pport fo
r
o
bject, pack
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Junio
C
H
a
mano
P
a
s
s CVSps
generated A U Thor <author@domain
.
xz> inta
c
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Mar
t
in
L
a
n
ghoff
[PATCH
]
ar
c
himport: Actual
l
y cope
with merge
s
f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-02
Jun
i
o C Hamano
Hon
o
r extractor's u
m
ask i
n
git-tar-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-01
Junio C Hamano
Hon
o
r use
r
's umask
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-01
L
inus Torvalds
[PATCH] Fla
g
empt
y
patches
as errors
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-01
Jun
i
o C H
a
mano
Consolidate null_s
h
a1[]
.
commit
|
commitdiff
|
tree
2005-09-30
Junio C
Hamano
S
t
ill insta
l
ling the old
command names
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-30
Juni
o
C Hamano
Te
l
l which pac
k
file i
s
corrup
t
w
h
en we die
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-30
Pav
e
l R
o
skin
[
PATC
H
] Make logerror
(
) and loginfo() st
a
ti
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-30
Johannes Schindelin
[PATCH] Old curl does
n
ot know ab
o
ut CURLOPT_SS
L
K
EY
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-29
Junio C Hamano
Use git-merg
e
i
n git-pull
(second try)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C
Hamano
Use gi
t
-upd
a
te-ref in scripts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Peter Hagervall
[PATC
H
] Make some needlessly globa
l
stuf
f
st
a
ti
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Nick Hengeveld
[PATCH
]
Support for more
CURL SSL
s
ettings via envi
r
o
n
men
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Tom Prin
c
e
[
P
ATCH
]
Add new
p
r
og
r
ams to
.
g
i
tignore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hama
n
o
Fa
s
t
p
a
t
h the normal case by not checkin
g
tha
t
in
d
ex
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C
Hamano
Fix default
p
ul
l
not to d
o
an
u
nintended Octop
u
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C
Hamano
Update th
e
cas
e
table in t/t1000
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Merge master
.
kernel
.
or
g
:/ho
m
e/
h
pa
/
git/da
e
mon
commit
|
commitdiff
|
tree
2005-09-27
Junio C Ha
m
ano
git-commit: u
s
e update-index --stdin,
inst
e
ad of xargs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C Hama
n
o
update-ind
e
x: doc
u
m
e
nt --stdi
n
an
d
-z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
updat
e
-
i
ndex: --stdin and -z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Nick Henge
v
eld
[PATC
H
] R
e
turn CURL e
r
r
o
r message
w
hen ob
j
ect
transfer
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Daniel Barkalo
w
[P
A
TCH] Implement --rec
o
ver for gi
t
-
*
-
fetch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Sven Verd
o
olaege
[PATCH
]
Provide
a
ccess to git_dir
t
hrough get_gi
t
_d
i
r
(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Peter Eriksen
[PATCH] Make the test more shell generic and fix missing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Really require
tk 8
.
4 (
R
PM)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
u
n
i
o C Hamano
Require tk 8
.
4 (RPM)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
u
n
i
o
C Hama
n
o
Merge h
t
tp:/
/
ww
w
.
kern
e
l
.
org/pub/sc
m
/git
k
/gitk
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git-fetch:
s
end informational
output to >&2 con
s
ist
e
ntly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C
H
aman
o
G
i
ve defau
l
t merge message after failed a
u
tomerge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hamano
Do not require
c
lean tre
e
when reverting and ch
e
rry
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C Hamano
F
i
x overzealous cleanliness check in git-m
e
r
ge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o C Hama
n
o
git-cl
o
n
e: check out
"mas
t
er" by d
e
fa
u
lt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-26
Junio C Ha
m
ano
Plug a small
race in update
-
ref
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Linu
s
Torvalds
[
PATCH] Add "git-update-ref" to
u
pdate the
HEAD (or
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
v
i
nen
[PATCH] More descriptive me
s
sages fo
r
conflict cases
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivi
n
en
[PATCH] recurs
i
ve-merge: D
o
n't
p
r
i
nt a
stack trace
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o
C H
a
m
ano
D
iff:
--name-st
a
t
u
s
o
ut
p
u
t format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Di
f
f
:
-
l
<num> to li
m
it rename/copy de
t
ectio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hamano
Diff clean-u
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C Ham
a
no
Merge b
r
anc
h
'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o C H
a
ma
n
o
C
l
e
a
n generated files
a
bit more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
St
o
p installing th
e
backward
c
ompa
t
ib
l
e s
y
m
links
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next