repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Use git-update-ref in scripts.
2005-09-28
Junio C Hamano
Use git-update
-
ref in
s
cripts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C
H
a
m
ano
Fastpath the normal case
by not c
h
e
c
k
i
n
g that i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Ham
a
no
F
i
x de
f
a
u
lt pull not to do an unint
e
n
d
e
d
O
c
topus
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
J
u
nio C Hamano
Update
t
he case
table in t/t1000
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Merge master
.
k
e
r
n
e
l
.
org:/ho
m
e/hpa/git/daemo
n
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
g
i
t
-commit: u
s
e
update-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-index: document --stdin and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio
C
Ham
a
no
upda
t
e-index: -
-
st
d
in
and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
n
i
o
C Ham
a
no
Really re
q
uire tk 8
.
4
(RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
m
a
no
Require t
k
8
.
4
(
R
P
M)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C Hamano
Merge http://
w
ww
.
kernel
.
org/
p
ub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-09-27
Junio
C Hama
n
o
git
-
fe
t
ch: send
i
nformatio
n
al
outpu
t
t
o
>&2 c
o
n
s
is
t
ently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C Hamano
Give
defau
l
t merge mess
a
ge after
f
ailed autom
e
rge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C Hamano
Do not require
cle
a
n t
r
ee whe
n
reverti
n
g
and
che
r
ry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C Ha
m
an
o
Fix ove
r
zealous cleanliness check in git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
uni
o
C Hamano
g
i
t-clo
n
e: check
out "master" by default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
J
u
nio C H
a
mano
Plug a small 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-statu
s
output
f
o
r
mat
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ham
a
no
D
iff
:
-l<num> t
o
limit rename/copy detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff
c
lean
-
up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
io C Hamano
M
e
rge
b
r
a
nch 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Clea
n
gener
a
t
e
d f
i
l
es a
b
i
t m
o
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ha
m
a
n
o
Stop
installing t
h
e backward compa
t
ible symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C Hamano
sho
w
-br
a
nch: f
i
x c
o
mmit
naming breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
unio C Hamano
g
i
t-grep: fix
'git grep -e $pat
t
ern
'
h
andling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C Ham
a
n
o
Remove use
o
f 'xargs -0' from git
-
re
s
et
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
H
a
mano
U
s
e
0
.
99
.
7
.
GI
T
a
s
v
e
rsion be
t
ween 0
.
99
.
7 and 0
.
9
9
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Haman
o
Sola
r
is
:
give a bit more built
-
i
n defau
l
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Haman
o
Really ignore genera
t
ed distribution material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
daemon
.
c: pid_t i
s
not int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
n
i
o C Hamano
Merge 'fixes' branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Further c
l
a
r
ify licensing statu
s
of
c
omp
a
t/sub
p
r
o
cess
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
I
g
n
or
e
a bit more generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Merge bran
c
h 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Make 'gi
t
diff
-
-
cac
h
ed'
synonymo
u
s to 'gi
t
diff -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C Hamano
Do not give alarming error mess
a
ge from rsy
n
c
i
n fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C
Ham
a
no
Prettyprint octopus merg
e
m
e
ssage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retir
e
d
iff-hel
p
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
J
u
ni
o
C Haman
o
Retire r
e
v-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io C H
a
mano
Retire git-expor
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Hamano
R
eve
r
t "Use
gi
t
-merge i
n
stead of git-
r
esolve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C Hamano
R
e
vert
"
Make
O
ctopus merge m
e
ssage a bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C
H
amano
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
mano
Fi
x
d
oc
u
mentat
i
on d
e
penden
c
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
unio
C Hamano
Make objec
t
crea
t
i
on in http fet
c
h a bi
t
safer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C H
a
m
a
no
Clarify du
a
l licens
e
status of subprocess
.
py file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
amano
Upd
a
te tu
t
o
r
ial w
i
th
Oc
t
opus
usage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
amano
Make
O
ctopus
m
erge message a bit nice
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Us
e
git-merge
instea
d
of git-resolve in g
i
t
-
pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C H
a
m
ano
Do
not give ala
r
m
i
n
g er
r
or mess
a
ge from rsyn
c
in
fet
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Sho
w
modified fi
l
es in gi
t
-ls-fi
l
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Fast-path 'update-ind
e
x --refr
e
sh
'
a bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C Hamano
Use GECOS fiel
d
a bit better
t
o produc
e
default hu
m
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Juni
o
C
H
a
mano
Document -i f
l
ag to git-rea
d
-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Ship our
o
wn
c
o
py of subproc
e
ss
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Hama
n
o
show-branch: Be nicer when running in
a
co
r
rupt
repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio
C H
a
mano
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
A
rrgh -- another asc
i
idoc caret workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
D
o
cument
ex
t
e
n
ded SHA1 us
e
d by git-rev-pa
r
se
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Ha
m
ano
fetch() a
s
s
umes
we do
not have the ob
j
ect
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C
H
amano
Merge branch
'maste
r
' of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Im
p
r
ove the safety check
used in fetch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Archive-destroyin
g
"git
r
e
pack -a -d" bu
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Ju
n
io C Hamano
Do not fa
i
l af
t
er
ca
l
l
i
ng bise
c
t_au
t
o
_
n
e
xt()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Juni
o
C Hamano
Fix ty
p
o in test comment
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Juni
o
C Ha
m
ano
[PA
T
C
H
] getdomainname s
h
ould be u
s
able on S
u
nOS with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Add g
i
t-send-email to
.
gitignor
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio
C Hamano
Teach rsync tran
s
port about alternates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
u
n
i
o C Hamano
[PATCH] fetch
.
c: cleanups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio
C Ha
m
a
no
[PATCH] Make g
i
t-c
h
eckout failure message more frie
n
dl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Jun
i
o C Hamano
R
ecommend
'l
e
s
s' for De
b
ian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
unio C Hamano
Re
v
ert breakage introduced by c
8
05
2
2e30fdc190f8
c
8c7fc983bbe0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
uni
o
C
Haman
o
Plug dif
f
le
a
ks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io C
Hamano
A
v
oid
wa
s
ting mem
o
r
y
while keeping tra
c
k
o
f what we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
u
nio C H
a
mano
B
e more backward compa
t
ible with git-s
s
h-{push,
p
ull}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C H
a
mano
Unoptimi
z
e
i
n
fo/refs
c
reation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
Hamano
Retir
e
inf
o
/rev-cach
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
unio C Hama
n
o
git-branch -d <branch>: delete u
n
used branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Ha
m
ano
Rev
e
rt "[PAT
C
H]
p
lug m
e
mory leak in diff
.
c::d
i
ff_free_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Make merg
e
c
o
mment git-
p
ul
l
makes for an octopus a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Jun
i
o
C
Hamano
Merge bra
n
ch
'master' of
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
re
a
d-tree: fix bog
u
s
d
e
bugg
i
ng sta
t
e
m
ent
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
git-merge-recursive: T
r
ivial RE f
i
xe
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Hamano
[PAT
C
H
]
Define relative
.
git/objects/in
f
o/alterna
t
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o
C
Hamano
Detect ls-r
e
m
ote failure properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hamano
Fix off-by-one er
r
or in git-
m
e
r
ge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ham
a
n
o
Propagate e
r
rors from
f
etch-pac
k
corr
e
c
t
ly to git-fe
t
ch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C Ha
m
ano
Fix CDPATH problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C
H
am
a
no
Merge branch
'
master'
o
f
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C Haman
o
Document g
i
t-grep
a
nd link it from the main git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o
C
H
a
mano
[
P
A
T
CH] Ma
k
e
'
git checko
u
t' a bit more forgiving whe
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
i
o C Hamano
[PATCH] Omit patches t
h
at
h
ave already been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C H
a
mano
Allow f
i
nding things that begin
w
ith a dash in 'git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Jun
i
o C
H
am
a
no
Merg
e
bran
c
h 'master
'
of
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hama
n
o
Use int instead
of so
c
kle
n
_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Prepare
0
.
99
.
7
relea
s
e candidate branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Hamano
Add a new mer
g
e strateg
y
b
y
F
redrik
K
uivinen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Hama
n
o
'git-merge': Docume
n
tati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Use Daniel's
r
e
a
d-tree in the merge
s
trategy 'resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
M
ulti-
b
ackend merge d
r
iver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next