repo.or.cz
/
git
/
trast.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Refactor merge strategies into separate includable file.
2005-11-06
Jon Loeliger
Refact
o
r merge
s
t
r
a
t
e
gies into sep
a
r
a
te includa
b
l
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Document expa
t
depe
n
d
e
ncy w
h
en using h
t
tp
-
push
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Hamano
Merge i
n
http-push firs
t
stage
.
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengeveld
Refresh the remote lock if it
i
s about to expire
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick
H
engeveld
Improve lock h
a
nd
l
ing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick Henge
v
eld
Support remote r
e
feren
c
es wi
t
h slashes in th
e
i
r
na
m
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nic
k
Hengeveld
Verify remo
t
e p
a
cks, speed
u
p pending request queue
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengeveld
Add sup
p
ort for pu
s
h
ing t
o
a remote
reposit
o
ry using
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
u
n
io C Haman
o
D
e
bian: test build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Hamano
Furthe
r
D
ebian split fix
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio C Hamano
Install asc
i
ido
c
sou
r
ce
s
as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ha
m
ano
Pa
c
k
a
g
e split: Debian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C H
a
ma
n
o
Simplify CFL
A
GS/
D
EFINES in Makefil
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
n
o
git-fet
c
h: fail if
specif
i
ed refsp
e
c d
o
es not m
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o
C
Hamano
Docu
m
entation:
p
u
ll/clone ref mapping cla
r
ificat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C Ha
m
ano
git-format-patch: silly
typo fi
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o C Haman
o
t
est: t4102
-
apply-rename fai
l
s with strict u
m
ask
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C H
a
mano
git-clone: fix loca
l
clone
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C
Hama
n
o
init-db::copy
_
file(
)
- u
s
e
c
o
py_fd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
uni
o
C Hamano
copy
.
c::copy_fd()
- do not leak file
descriptor on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C Haman
o
D
o
c
umentation: forma
t
-patc
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Ju
n
io C
Hamano
format-pa
t
ch: "r
e
v
1
.
.
" shoul
d
m
ean "
r
ev1
.
.
H
EAD"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o C Hamano
Docum
e
n
tation: git-fetch/
p
ull updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
on Loeliger
Add
e
d a
f
ew exam
p
les to gi
t
-pul
l
man page
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C Hamano
Document the --no-co
m
mit f
l
ag b
e
t
t
e
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Juni
o
C Ham
a
no
Doc
u
men
t
at
i
on: -
m
erge and
-pull: des
c
ribe merge
st
r
ate
g
ies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Ju
n
io C Hama
n
o
Documentation: gi
t
-add -- do
not say "cache"
,
add exa
m
p
les
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Juni
o
C Ham
a
no
git-tag: Do not
a
s
sum
e
t
he
working tree root is writable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Nick Hengeveld
Rem
o
ve the temp file i
f
it is empty a
f
ter th
e
request
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C Hamano
Illustration: "C
o
mmit D
A
G Revision Naming"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C H
a
ma
n
o
Illustra
t
ion: "Git Diff Types"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C Hamano
Illus
t
r
a
ti
o
n:
"Fundamenta
l
Git
I
ndex Opera
t
i
o
ns"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio
C
Ham
a
no
g
i
t-merge
-
ours
:
make s
u
re
o
u
r
i
n
dex matches HEAD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C Ha
m
ano
Add 'ours' merge strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C Hamano
Add --no-
c
omm
i
t to
git-merge
/
git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
Doc
u
ment
-
-s
i
nce an
d
--until options to rev-p
a
rse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C Hama
n
o
Be careful when dereferencing tags
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Peter
E
r
i
ksen
[PAT
C
H] Clean up the SunOS Makefile
r
u
le
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
a
mano
Ignor
e
'\r
'
a
t the end of line i
n
$GIT_
D
IR/confi
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Alex Riesen
remove CR/LF from
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C H
a
mano
D
o
not fail on hierarchical branch name
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Make
test-date buildab
l
e a
g
ain
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Ju
n
io C Hamano
gi
t
-cl
o
n
e:
d
o
n
o
t forget to create ori
g
in bra
n
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C H
a
mano
Do
n
ot pu
t
automatic merge message after s
i
gned-off
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C
Hamano
A
d
d
-P to the documen
t
ati
o
n head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
M
a
rtin La
n
gh
o
ff
cvsimport
:
cvsps sh
o
uld be quiet
t
oo
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Martin Lang
h
off
c
v
simport: introduce -P <
c
vsps-out
p
ut-fil
e
> o
p
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Marti
n
L
a
ngh
o
ff
cvsim
p
ort: catc
h
error condition where
cvs host disappears
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
D
o
not install backw
a
rd
c
o
mpatibility links any
m
ore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Josef
W
eidendorfer
S
tri
p
any
trailing s
l
ash on dest
i
nation argument
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Petr B
a
udis
g
it-am
.
txt is no s
t
ub an
y
more
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Petr
B
audis
Doc
u
me
n
t
a
tion
for git-fmt-merge-m
s
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
P
e
tr B
a
udis
Remove git-findtags
.
pe
r
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Jon Loel
i
g
e
r
R
emove '
P
reviously
t
his command was
kn
o
w
n
as
.
.
.
' messages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio C H
a
mano
Fi
x
c
o
nstness of input in moz
i
lla-sha1/sha1
.
c::S
H
A1_U
p
date(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio C Hamano
Document the use of
"
curre
n
t
directory" as pull
s
o
ur
c
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Lin
u
s
Torvalds
A
dd exampl
e
s for git-l
o
g
doc
u
mentation an
d
o
thers
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Juni
o
C
Hama
n
o
Work a
r
o
u
nd an
R
PM build pr
o
blem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio
C
Hamano
F
ix
rev-list document
a
tion again (--sparse and
p
a
t
hs
p
ec)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Ha
m
ano
U
pdate git-pack
-
objects docum
e
ntation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Updat
e
g
i
t-re
v
-list
o
ptio
n
s list in rev-par
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
J
u
ni
o
C
H
amano
Update
usa
g
e string and documentat
i
on for git-rev-list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Chris Sho
e
maker
Add to
u
sage and d
o
c
s
f
or gi
t
-
a
d
d
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Chris S
h
oemaker
Add to docu
m
entation of git
-
upda
t
e-index a
r
guments
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Chris Sh
o
e
m
aker
A
d
d us
a
ge stat
e
ment to g
i
t-che
c
k
o
ut
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
GIT 0
.
99
.
9 mas
t
er br
a
nch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
GIT 0
.
9
9
.
9
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hama
n
o
Do
c
ume
n
tation up
d
a
tes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
unio C Hamano
Do not mmap-c
o
py the whol
e
thing; just use c
o
py_
f
d()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hama
n
o
Teac
h
local-fetch about lazy o
b
j
e
ct directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
Fi
x
recent
d
o
c
umentation format breakage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schindelin
make t5501
l
ess annoying
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Joha
n
n
es Sc
h
indelin
fi
x
multi_ack
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schi
n
delin
git-fetch-pac
k
: S
u
p
p
ort multi_ack
extension
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Joha
n
nes
S
c
hindelin
git-upload-pac
k
: Sup
p
o
r
t the multi
_
ack protocol
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
o
hannes Schi
n
delin
Suppo
r
t
receiv
i
n
g
s
e
rver capabilities
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Johannes
Schi
n
delin
git-uploa
d
-pack: More efficient u
s
age of the
h
as_sha1
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
o
ha
n
nes Schindelin
I
mplemen
t
an interoperability test
f
or fetch-pack/u
p
load
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schindelin
Impl
e
ment a t
e
st for git-fetch-
p
a
c
k
/
git-upload-pack
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schindelin
Make maxima
l
use o
f
the remote refs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
o
hannes Schindelin
Subject: [
P
ATCH
]
git-fe
t
ch-p
a
ck: D
o
not
us
e
git-re
v
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
H
amano
gi
t
-ap
p
ly
--numstat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoe
m
ake
r
@cox
.
net
Add usa
g
e
h
elp to git
-
pu
s
h
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoemaker@
c
ox
.
net
Add usage help f
o
r
gi
t
-reset
.
s
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoemaker@cox
.
net
Minor cla
r
ificat
i
ons in diffcor
e
documentat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoemake
r
@c
o
x
.
net
Rem
o
ve -r from common diff optio
n
s
d
ocumentation in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoemaker@cox
.
net
update usage string for git-comm
i
t
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoemaker@cox
.
net
git-push
.
s
h: Reta
i
n cute
n
ess, add helpf
u
l
ness
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Li
n
us Torvalds
Be m
o
r
e
car
e
ful about reference parsing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Linus
Torvald
s
Be margin
a
l
ly
mor
e
ca
r
eful
a
bout re
m
oving objects
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Ch
r
i
s Shoemaker
Documentat
i
on changes to
recursive opt
i
o
n for g
i
t-diff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Pavel Roskin
fix testsuite to tolerate sp
a
ce
s
in path
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Junio
C Hama
n
o
D
o
cument g
i
t-patch-id
a bit better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Johannes Schin
d
e
l
in
Add more generated files
t
o
.
giti
g
no
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Johann
e
s Schindelin
Link
gi
t
-name-re
v
and
g
it-s
y
mb
o
lic-ref
f
r
om th
e
m
a
i
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Linus
T
orvalds
Create object subdirectories o
n
dema
n
d (
p
hase II)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-27
Junio C Ha
m
a
no
Merge
b
r
a
nch 'js
-
fat'
commit
|
commitdiff
|
tree
2005-10-27
Junio C Ha
m
ano
Merge branch 'lt-dense'
commit
|
commitdiff
|
tree
2005-10-27
Juni
o
C Hama
n
o
Merge
h
ttp://www
.
ker
n
el
.
o
r
g/pu
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-10-26
Linus To
r
valds
g
i
t-
r
ev-list: do not f
o
r
g
e
t
non-commit re
f
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next