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] Teach the recursive merge strategy about renames.
2005-10-02
J
u
n
io
C
Hamano
read-tree: remove --head option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
J
unio C Hamano
Cust
o
mize gi
t
com
m
and for in
s
tallations that lack cer
t
ain
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
J
u
nio C Hamano
More portab
i
lity
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
Add git-symbolic-ref
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
Us
e
resolve_re
f
() to i
m
plem
e
nt read_r
e
f()
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Jun
i
o C Ha
m
a
n
o
Te
a
ch update-ref
about
a
symbolic ref
stored in a
t
extfi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
J
unio C Hamano
Update par
t
ia
l
HTTP
t
ransfers
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
Pass CVSps generated A U T
h
or
<
author@do
m
ain
.
xz>
intact
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
Honor e
x
t
r
a
ct
o
r's
u
mask in
git-tar-
t
ree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-01
Juni
o
C
H
amano
Honor
user
'
s u
m
a
sk
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-01
J
u
n
i
o
C
Hamano
C
ons
o
li
d
ate
null_sha
1
[]
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-09-30
Juni
o
C H
a
mano
Still installing the old command nam
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-30
Junio C Ha
m
ano
Tell whic
h
packfil
e
is c
o
rru
p
t wh
e
n we die
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-29
Juni
o
C
Hamano
U
se
git-me
r
ge in git-pull (s
e
cond tr
y
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Juni
o
C Hamano
U
se git
-
update-ref in
scripts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C
Hamano
F
a
stpath the normal case by n
o
t checkin
g
that
index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Fix defau
l
t pu
l
l
n
ot to do an unin
t
ended Oc
t
op
u
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Jun
i
o
C
Hamano
Update the case ta
b
le
in t/t1000
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Mer
g
e
master
.
k
e
rnel
.
org:/home/hpa/git/dae
m
on
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Haman
o
git-c
o
mmit:
u
s
e updat
e
-ind
e
x
-
-
stdin, instead of xa
r
g
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
H
a
m
a
no
up
d
ate-index: docume
n
t
--stdin
a
n
d -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Ham
a
no
updat
e
-index: --stdin
a
nd -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o
C
Hamano
R
e
al
l
y require tk 8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hamano
Require tk 8
.
4
(RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
un
i
o C Hamano
Mer
g
e http://www
.
ke
r
nel
.
org/p
u
b/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hamano
git-fetch: send in
f
ormational output to
>
&2
con
s
isten
t
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Give default merge messag
e
after failed
auto
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Haman
o
Do not
r
e
quire c
l
e
a
n tree when rev
e
rting and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
ma
n
o
F
i
x overzealous cleanliness
c
h
e
ck in git-
m
erge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
gi
t
-cl
o
ne: check
out "master" b
y
d
efault
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Junio C Hamano
Plug a
s
mall race in update-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff: -
-
name-status output
f
o
r
m
a
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff: -l<num>
to limit rename
/
c
opy detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
H
a
m
a
n
o
D
i
ff clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C Hamano
Mer
g
e br
a
nch 'fixes
'
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Clean generated files a b
i
t more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ham
a
n
o
Stop
i
nstalling the backward compat
i
ble symlin
k
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
show-
b
ranc
h
: fix c
o
mmit na
m
ing breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
unio C Hamano
git-grep: f
i
x
'
git grep -e $pat
t
ern' h
a
ndling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C Hamano
Remove use o
f
'xar
g
s
-0' f
r
om gi
t
-reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
n
io C Hamano
Use 0
.
99
.
7
.
GIT as versi
o
n
bet
w
e
e
n 0
.
99
.
7 and 0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C Hamano
S
olar
i
s: give a
bit m
o
re
b
uilt-in de
f
a
ult
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Really igno
r
e
g
en
e
rated distribution material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hama
n
o
dae
m
o
n
.
c:
pid_t
i
s n
o
t
int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
a
m
ano
M
e
r
ge
'
fixes' bran
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
F
urther clarify lic
e
nsing status o
f
compat/subproc
e
ss
.
p
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C Hamano
I
gnore
a
bit
m
ore
g
enerated fil
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Merge b
r
a
nch
'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C Ha
m
ano
Make 'git diff --cached' synonymous
to
'
g
it diff
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Juni
o
C Hamano
D
o
no
t
give al
a
rming error message from rsy
n
c in
f
etc
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Prettyprint octopus merge message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire diff-help
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio
C
Hamano
Retir
e
rev-
t
ree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio
C Ha
m
a
n
o
Retire git-ex
p
ort
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C Hamano
Re
v
ert "
U
se git-mer
g
e instead of g
i
t-resol
v
e in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o
C
Hamano
Revert "Make Oc
t
opus merge
m
e
ssage a bi
t
nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
J
unio C Hamano
Fix documentation dep
e
n
d
ency
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C Ham
a
no
Make object creation in http
f
etch
a
bit safer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Haman
o
Clarify dual lic
e
nse s
t
atus of subprocess
.
py file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C H
a
mano
Up
d
ate
tut
o
rial with Octopus usage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
an
o
M
a
ke Octopus mer
g
e message a bit ni
c
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
uni
o
C Hamano
Use git-merge instead
o
f
git-resolve in git
-
p
u
ll
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C Hamano
Do no
t
give alar
m
ing error messag
e
f
rom
r
s
ync in
fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Hamano
Show modified files
i
n git-ls-f
i
l
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Hamano
Fast-path '
u
pdate-ind
e
x --refresh' a
b
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Hamano
U
s
e
G
ECOS field
a
bit
b
e
tter to produce default h
u
man
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Doc
u
m
ent -
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
Ship our
o
wn c
o
py
of su
b
process
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hama
n
o
s
h
ow-
b
r
a
nch: Be nicer
whe
n
runnin
g
in
a
corrupt
r
e
positor
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Ar
r
gh -- another asciidoc caret work
a
round
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C Haman
o
D
ocu
m
ent extended SHA1 used by
g
it-rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C
Hamano
fetch() as
s
umes we d
o
not
h
a
v
e
the
o
bject
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Juni
o
C Haman
o
M
e
r
g
e branch 'm
a
ste
r
' of
.
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
io C
H
amano
I
m
pr
o
ve
th
e
safe
t
y ch
e
ck used in
f
etch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Haman
o
Arc
h
ive-destroying "git repack -a -d" b
u
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
u
nio C Hamano
Do no
t
fail after calling bis
e
ct_aut
o
_next()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Haman
o
Fi
x
typo in test co
m
m
ent
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
unio C Ham
a
n
o
[PA
T
C
H] g
e
tdomainn
a
m
e should be
usable
o
n
SunOS with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
Hamano
Add gi
t
-
s
e
nd-em
a
il
t
o
.
gitignor
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
T
each rsync trans
p
o
rt
abo
u
t alternates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Juni
o
C Ha
m
ano
[PATCH] f
e
tch
.
c: c
l
eanups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
unio C Hamano
[PATCH] M
a
ke git-c
h
eckout f
a
ilure me
s
sage more friendly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
R
e
commend 'less'
f
or De
b
ian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Juni
o
C Hama
n
o
Revert
breakage introduced by c80522e30fdc190f8c8c7fc983bb
e
0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
P
l
ug
diff leaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Jun
i
o C Hamano
Avoid wasting memo
r
y while ke
e
ping track of what we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Juni
o
C
Ham
a
no
Be
m
ore bac
k
ward compatible with git-ssh-{push,pull}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
un
i
o C Haman
o
Uno
p
timize info/refs creat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Jun
i
o C Hamano
Retire
i
nfo/rev-
c
a
c
h
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Ham
a
no
git-branch -d <branc
h
>: delete
u
nused branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C H
a
mano
Revert "[PATCH] p
l
ug memory leak in diff
.
c
::diff_free_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Juni
o
C Hamano
Make merge commen
t
git-p
u
ll
makes fo
r
an octopus
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C Haman
o
M
erge
branch 'm
a
st
e
r' o
f
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C
H
a
man
o
re
a
d-tree:
f
ix bogus de
b
ug
g
ing st
a
tement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
J
u
nio
C Haman
o
git-merge-recur
s
ive: T
r
i
vial RE fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o
C Hamano
[P
A
TCH] Def
i
n
e relative
.
git/objects/info/alter
n
ates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hamano
Detec
t
ls-remot
e
failure
p
roperly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hamano
Fi
x
off-by-one
error in git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next