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
Junio C Hamano
Fall back to three-way merge w
h
en
a
pplying
a
patch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-06
Junio C H
a
mano
g
i
t-shortlog
:
make
t
he mailmap conf
i
gurable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio
C
Ham
a
no
Merge branch 'f
i
xes'
commit
|
commitdiff
|
tree
2005-10-05
Junio
C
H
a
mano
c
l
one-pac
k
:
use create_sym
r
ef() instead of
r
aw symlink
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio
C
Ham
a
n
o
upload-p
a
ck:
Do
n
o
t
choke on to
o
many he
a
ds
request
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C
Hamano
F
ix d
i
ff-filter Al
l
-O
r
-
N
on
e
m
a
r
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
J
u
nio C Ha
m
an
o
Recor
d
which tr
e
e the patch ap
p
lies to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio
C
Hamano
git-applypatch:
cleanup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Ha
m
ano
git
-
appl
y
: retire un
u
sed/unimpleme
n
t
e
d --n
o
-merge flag
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
J
u
nio C Hama
n
o
git-apply: a
l
low
o
p
e
rating in sparsely popula
t
ed wo
r
king
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hamano
Return error whe
n
n
o
t che
c
k
ing 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 'fixe
s
'
commit
|
commitdiff
|
tree
2005-10-05
Junio C Ha
m
a
no
Add missing documen
t
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Junio C Hamano
Remove
u
sele
s
s
use of se
d
in git-forma
t
-pat
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Junio
C Ham
a
no
L
eave an empty line bet
w
e
en log
a
nd sign-
o
ff
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
J
u
nio C Ha
m
ano
R
emo
v
e unused external-diff
script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Junio C
H
amano
On Cygwin, u
s
e
symbol
i
c ref, not
a
s
y
m
boli
c
link, to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
J
unio C Hamano
M
erge
b
r
a
nch
'fixe
s
'
commit
|
commitdiff
|
tree
2005-10-04
Junio C Hamano
Avoid compiler warning
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
J
u
n
io C H
a
mano
Make
sure get_
s
ha1
does
n
o
t
ac
c
ept
ambi
g
uo
u
s
sha1
p
refix
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Junio C Hamano
M
e
rge
branch 'fixes'
commit
|
commitdiff
|
tree
2005-10-03
J
unio C
Hamano
[PATCH]
Merging
t
h
e
Cygwin c
h
anges
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Junio C Hamano
git-pull: do not barf on -a flag meant f
o
r
git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Junio C Hamano
Error
m
essage from g
e
t
_
sha1() on ambi
g
uous sh
o
r
t SHA1
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Junio C Ham
a
n
o
Make sure ge
t
_sha1
does n
o
t accept amb
i
guous sha1
p
refix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Junio C Hamano
F
i
x
minor
D
OS
i
n
r
ev-l
i
st
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
P
o
st 0
.
99
.
8 maste
r
br
a
nch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
GIT 0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Haman
o
Hand
l
e really
trivia
l
case inside git-
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio
C Ha
m
ano
read-tree: remo
v
e --head
option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
J
u
n
i
o
C Hamano
Customize git
c
omma
n
d
f
o
r
in
s
tall
a
tions that lack cer
t
ain
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
More portability
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Ham
a
no
Add git
-
sy
m
bolic-r
e
f
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
Use resolv
e
_r
e
f() to implement read_
r
ef()
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
Teach update-ref about a symbolic
r
ef store
d
in a textfile
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
U
p
d
a
te partial HTTP tr
a
n
s
fer
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio
C Hamano
Pass CVSps generated A U Thor <author@domain
.
xz> intact
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Ju
n
io
C
Hamano
Honor ext
r
ac
t
or's umask in git
-
tar
-
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-01
Junio C Hama
n
o
Ho
n
or
u
ser's uma
s
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-01
Ju
n
i
o C Hamano
C
onsolidate null_sha1[]
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-09-30
J
u
nio
C Haman
o
Stil
l
installing
the old c
o
mmand n
a
m
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-30
J
u
nio C Hamano
T
ell which packfile is
c
orrupt whe
n
we die
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-29
Junio
C Hamano
Use gi
t
-merge in gi
t
-pull
(second
try)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Jun
i
o C Hamano
U
se git-update-ref
i
n scripts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C
Hamano
Fast
p
a
t
h
t
he nor
m
a
l
c
ase b
y
n
ot checking that inde
x
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
J
u
nio C Ham
a
no
Fix def
a
ult pull n
o
t to do an uninten
d
ed Octopus
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hama
n
o
Update
t
he case table in t/t1000
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Jun
i
o C Ham
a
no
Me
r
ge maste
r
.
kernel
.
org:/home/hpa/git/daemon
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git-comm
i
t: use update-index
-
-stdin
,
inst
e
a
d
o
f xargs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C H
a
mano
update-index: documen
t
--stdin and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
update-in
d
ex: --stdin and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hamano
Rea
l
ly
require
t
k
8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
Re
q
uire tk
8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
un
i
o
C
H
a
ma
n
o
M
e
rge http://www
.
k
ern
e
l
.
org/
p
ub
/
scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git-fetch: send infor
m
ational output to >&2 consi
s
tently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Giv
e
def
a
ult merge message
afte
r
f
ailed automerge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
m
a
no
Do
n
ot require clean
t
ree when reverti
n
g and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Ha
m
ano
Fi
x
overzealous cleanliness
c
h
e
c
k
i
n
g
it-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C Ham
a
no
git-clone: check
out
"master"
b
y de
f
a
u
lt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Junio C Ham
a
no
Plug a s
m
all race in upda
t
e-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C Ham
a
no
Di
f
f
: --n
a
me-status out
p
u
t f
o
r
mat
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio
C
Hamano
Diff: -
l
<num> to limit rename/copy de
t
ect
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
mano
Dif
f
clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
M
erg
e
branch 'fixes
'
commit
|
commitdiff
|
tree
2005-09-25
Junio C Haman
o
C
lean generated files
a bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C Hamano
Stop ins
t
alling the backward
c
o
mpatible symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
io C Hamano
show-
b
r
a
nch: fix
commit na
m
ing br
e
akage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C Haman
o
git-g
r
ep: fix 'git
g
r
e
p -e $pa
t
t
e
rn' handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C Hamano
Remov
e
u
s
e
o
f
'xargs -0
'
f
rom git
-
rese
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
mano
Use 0
.
99
.
7
.
G
I
T as
v
ers
i
on between 0
.
9
9
.
7 and 0
.
9
9
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Solari
s
:
give a bit mor
e
bu
i
lt-in defaults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Real
l
y ignore gene
r
a
te
d
distrib
u
tion material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Haman
o
daemon
.
c: pid_t is n
o
t int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
unio
C Hamano
Merge 'fixes' branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
n
io C Haman
o
Furt
h
er clarify licensing status
o
f
c
o
mp
a
t/subprocess
.
p
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C
H
a
mano
Ignore a
b
it more generated
files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C H
a
m
ano
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Junio
C
Hamano
Ma
k
e 'git di
f
f
--cached'
synonymous
to 'git
d
iff
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C Ha
m
ano
Do not
g
i
ve
a
l
armin
g
error mess
a
ge fr
o
m
rsync in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o
C Hamano
Prettyprint octopus me
r
g
e
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io C Haman
o
R
eti
r
e diff-helper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C
Ham
a
no
Retire rev-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
J
u
n
io C Hamano
Retire
g
i
t-e
x
port
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "Use g
i
t-merge instead o
f
g
it-res
o
lve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C
Hamano
Revert
"
Make O
c
topus merge messag
e
a
b
it
n
icer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C
Hamano
Merge
b
r
a
nch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Fix documentation de
p
e
nde
n
cy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Hamano
Make object creation
i
n
http fetch a bit safer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io
C Ha
m
ano
Clarify
d
u
a
l licen
s
e
s
t
a
tus of subp
r
o
cess
.
py f
i
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Update tutorial wit
h
Octopus
usa
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Hamano
Make Octopus merg
e
message a
b
it nicer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
H
amano
U
se
g
it-mer
g
e
ins
t
e
a
d o
f
git-resolve in git-
p
ull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Do not give alarming error message from rsync
i
n fe
t
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
S
ho
w
modif
i
e
d
files
in
git-ls-files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Hamano
Fast-
p
ath
'
update-index
--ref
r
esh' a bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Use GECOS
field
a
bit better to produce
d
efa
u
l
t hum
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Document -i flag to git-read-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
Sh
i
p our own copy o
f
subp
r
ocess
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
show-br
a
n
c
h: Be nicer when
running in a c
o
rrupt repos
i
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Hamano
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
next