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
Clean mail files after dealing with them.
2005-10-06
J
unio C H
a
m
ano
Clean ma
i
l f
i
les
after dealing with them
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-06
Junio C Ha
m
a
no
Fall back to three-way merge when appl
y
ing a patch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-06
Junio C Hamano
gi
t
-sh
o
rtlog: ma
k
e the mail
m
a
p
c
o
nf
i
g
u
rab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio
C
Haman
o
Merge branch '
f
ixes'
commit
|
commitdiff
|
tree
2005-10-05
Junio
C
Hamano
c
l
o
n
e-pack: use create_sy
m
ref() i
n
s
t
ea
d
of r
a
w symlink
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hama
n
o
upl
o
ad-p
a
ck: Do not
c
hoke on too many heads
request
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hamano
Fix diff-fil
t
er All-
O
r-No
n
e mark
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Juni
o
C Hamano
Record whi
c
h
tree the pat
c
h applies to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hama
n
o
gi
t
-a
p
plypa
t
ch: cleanu
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hamano
gi
t
-apply: re
t
ire
u
nused/un
i
mplemented
-
-no-
m
erge flag
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hamano
git-apply: a
l
low operating in sparsely populated working
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Jun
i
o C Hamano
Return
e
rror whe
n
n
o
t checking out an entry du
e
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hamano
Mer
g
e branch 'fixes
'
commit
|
commitdiff
|
tree
2005-10-05
Junio C H
a
mano
Add mis
s
ing documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Junio C Hamano
Remove useless
use of sed in git-format-
p
atch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Junio C Ham
a
n
o
L
eave an empty line between log and sign-o
f
f
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Juni
o
C Hamano
Remove unused extern
a
l
-
diff scrip
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Juni
o
C Hama
n
o
On
C
y
g
win, use
s
ymbolic ref, n
o
t a s
y
m
b
o
lic link
,
to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Junio C
Hamano
M
e
rge branch 'fixes'
commit
|
commitdiff
|
tree
2005-10-04
Junio C Hamano
Avoi
d
compiler w
a
rning
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Junio C
H
am
a
no
Make sur
e
get_sha1
does
n
o
t accept ambiguous sha1
p
re
f
ix
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Junio
C Hamano
Merge branch
'
fixe
s
'
commit
|
commitdiff
|
tree
2005-10-03
J
u
nio C Hamano
[PATCH]
Merging t
h
e
Cygwin changes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Ju
n
io C Hamano
git
-
pull: do not barf on -
a
flag meant for git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Junio C Hamano
Error messag
e
from ge
t
_sha1() o
n
ambigu
o
us shor
t
S
HA1
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Ju
n
io C Hamano
M
a
k
e
sure get_sh
a
1 does not accept ambiguous s
h
a1 prefix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
J
unio C Ham
a
no
Fix min
o
r DOS
in rev
-
list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Ham
a
no
Post 0
.
9
9
.
8 master
branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
GI
T
0
.
9
9
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio
C
Hamano
Handle
r
e
ally t
r
ivial cas
e
inside
g
it
-
merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
J
u
nio C Hamano
rea
d
-tree: remove
-
-he
a
d option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
Customize git command for ins
t
allations that lack certa
i
n
.
.
.
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
g
it-symbolic-ref
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Junio
C
H
amano
Use
r
e
s
olve_r
e
f() to implement
r
e
a
d_ref()
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Ju
n
i
o C H
a
mano
T
each update-ref about
a
symbolic ref
s
tored i
n
a textf
i
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
J
unio
C
Hamano
Updat
e
partial HTTP transfers
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Juni
o
C
Hama
n
o
Pass CVSps generated A U Thor <author@
d
omain
.
xz
>
intact
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C
H
amano
H
onor extractor
'
s uma
s
k in
g
it-ta
r
-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-01
Junio C
H
a
m
ano
Honor
use
r
's umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-01
J
unio
C Ha
m
ano
C
onsol
i
d
a
te null_s
h
a1[]
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-09-30
Junio C Hamano
S
till i
n
s
t
a
lli
n
g
th
e
old c
o
mman
d
names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-30
J
u
nio C H
a
mano
T
e
ll which packfil
e
is corrupt when we die
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-29
J
u
n
i
o
C Hamano
Use git-merge in git-pull (s
e
cond try)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Haman
o
Use gi
t
-update-ref in scripts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C
H
amano
Fastpath the n
o
r
mal
c
as
e
by not checking that in
d
ex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Jun
i
o C Ham
a
no
F
ix default pull not to do an unintended Octopus
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Update the c
a
se ta
b
le in t/t1000
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Merge master
.
kernel
.
org:/home/
h
p
a
/git/daemon
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o
C
Hamano
git-commit: use
u
pdate-index
--stdin, instead o
f
xargs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C Hamano
update-i
n
de
x
: docum
e
nt --stdin and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C Hamano
update-i
n
dex: --stdin
a
nd -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Ha
m
a
no
Real
l
y requir
e
tk
8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
ni
o
C
H
amano
R
e
quire tk 8
.
4
(RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
M
e
r
g
e http://www
.
kernel
.
org/pub/
s
cm/gitk/git
k
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C
Ham
a
no
git-fetch: send informatio
n
al out
p
u
t
to >&2 consistently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C Ham
a
no
Gi
v
e
default merge message a
f
ter fa
i
led automerge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Do not require clean t
r
ee when rever
t
ing a
n
d cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
Fix
o
verzealous cleanlines
s
check in git-mer
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C H
a
mano
git-clone: check out "master" b
y
defa
u
lt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
J
u
nio C Ha
m
ano
Plug a small
r
a
ce in u
p
dat
e
-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff: --name-
s
tatus output format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff
:
-l<n
u
m
>
to limit rename/copy detectio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
io C Hama
n
o
Dif
f
clean-u
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C Hamano
M
e
rge
branch
'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o
C
Hamano
Clean
g
enerated files a bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Juni
o
C
Hamano
Stop installin
g
the backward
compatible
symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
mano
s
h
ow-branch:
fix com
m
it naming br
e
a
k
a
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
amano
git-grep: fix 'g
i
t
gre
p
-
e
$pattern' handlin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
Ham
a
n
o
R
e
mo
v
e use of '
x
ar
g
s
-0' from g
i
t
-
reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Juni
o
C
Ha
m
ano
Use 0
.
99
.
7
.
G
I
T as
v
ersion between 0
.
99
.
7 and
0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
Hamano
Solaris: give a
b
i
t
mo
r
e built-
i
n default
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Really ignore generated distri
b
uti
o
n material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
amano
d
a
emon
.
c
: pid_
t
is not int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C Hama
n
o
Mer
g
e 'fixes' br
a
nch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
Hamano
Further clarify l
i
censi
n
g statu
s
of comp
a
t/subpro
c
ess
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C Hama
n
o
Igno
r
e
a
b
i
t
m
ore gen
e
rated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Ju
n
io C Hamano
Make 'git diff
-
-cached' s
y
n
onymous to 'git di
f
f -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C
Hamano
Do
n
ot
giv
e
alarming e
r
ror
message
f
rom rsync
i
n fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Ha
m
ano
Prett
y
print
octopu
s
me
r
ge message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io
C Hamano
Ret
i
re di
f
f-
h
elper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
J
uni
o
C
H
amano
Retire
rev-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
i
o
C Hamano
Retire git-export
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
Hamano
Reve
r
t "Use git
-
merge
i
n
stead o
f
git-resolv
e
i
n
git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert
"
M
a
k
e
Octopus merge
m
essage
a bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C
H
amano
Mer
g
e branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C
Hamano
Fix documentation dependency
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
i
o
C H
a
mano
M
a
k
e object
c
reation
i
n
h
t
tp fetch a bit
sa
f
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io
C Hamano
Cla
r
ify dual
li
c
ens
e
stat
u
s of subpr
o
cess
.
py file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
ama
n
o
Update tutori
a
l with Octopu
s
u
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Make Octopus merge message
a bit nic
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
Hamano
Use git-merge in
s
tead of git-resolve in git-p
u
l
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hama
n
o
Do
n
ot give alarming
e
rror
messag
e
from rsync
i
n
fetc
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io C
H
ama
n
o
Show mo
d
ified files
i
n git-ls-
f
i
les
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io C Haman
o
F
a
st-path 'update-in
d
e
x
--refresh' a
b
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Juni
o
C Hamano
Use GECOS f
i
eld a bit bet
t
er to produce de
f
ault human
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
unio C H
a
m
a
n
o
Document -i flag to
g
it-r
e
ad-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ha
m
ano
Ship
our
o
w
n copy of subproc
e
ss
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
n
io C
H
amano
sh
o
w-branch: Be nicer when run
n
i
ng
in a c
o
rrupt repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next