repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'master'
2005-11-07
Junio C Ham
a
no
Merge branch 'master'
commit
|
commitdiff
|
tree
2005-11-07
Jun
i
o C H
a
mano
Documentation:
talk
about guts of merge in
tutorial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Jon L
o
eliger
R
e
factored merge
o
p
t
ions into separate merge-options
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
GIT 0
.
99
.
9e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Johan
n
es Schind
e
lin
h
t
t
p-fetch: do not
use cur
l
_mess
a
ge
after releasing it
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Jo
h
an
n
es Sc
h
ind
e
lin
Allo
w
GIT
_
D
I
R
to be a
n
absolute path
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Paul Collin
s
http-push
.
c: include
with
a
ng
l
e b
r
acket,
not dq
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
H
a
m
a
no
Set up
r
e
mot
e
s
/
origin to t
r
ack all remote branches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Juni
o
C Ha
m
ano
g
i
t-status: do not mark unmerged paths as committable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Juni
o
C
Haman
o
ls-f
i
l
e
s: --others should no
t
say unmerged paths are
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Randal L
.
Sc
h
wartz
Use fin
k
/d
a
r
w
inpor
t
paths for OS
X
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Jon L
o
eliger
Refactor merge strategies int
o
separ
a
te includable
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Hamano
D
ocument expat dependency whe
n
u
s
ing
htt
p
-push
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Merge in http-push
first stage
.
commit
|
commitdiff
|
tree
2005-11-06
Nick
Hengev
e
ld
R
efresh the r
e
m
o
t
e
lock if
it
is about to expir
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengev
e
ld
Impr
o
v
e
l
ock handlin
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick
H
engeveld
Support rem
o
te
ref
e
renc
e
s w
i
t
h
sla
s
hes in their name
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nic
k
Hengeveld
Verify r
e
mote
p
a
c
ks, speed u
p
pe
n
ding r
e
q
u
e
st que
u
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nic
k
H
e
n
geveld
Add supp
o
rt for pus
h
ing to a remote repository us
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
n
o
Debian:
t
e
s
t build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C Hamano
Furt
h
er Debian
split fixe
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
am
a
no
Instal
l
asciidoc sources as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C H
a
mano
Package spl
i
t:
D
ebian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
amano
Simplify
CFL
A
GS/DEFINE
S
in Makefile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Hamano
git-
f
etch:
f
ail if specifie
d
refspec does not match
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
unio
C Hamano
Document
a
tion: p
u
l
l/clone ref
mapping clarif
i
cation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C Haman
o
git-format-patch:
silly typ
o
f
ix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
n
io C Hamano
test
:
t4102-app
l
y-rename fails
w
ith stri
c
t umask
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
GIT 0
.
99
.
9d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Ha
m
ano
g
it-clone: fi
x
local clone
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
init-db::copy_file() - use copy_fd(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
aman
o
copy
.
c::c
o
py_fd() - do
n
ot leak file descript
o
r on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
D
o
c
ument
a
tion: format
-
p
a
tch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Ju
n
io C Hamano
format-pa
t
ch: "re
v
1
.
.
" should
m
ean "re
v
1
.
.
HEAD"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C
Hama
n
o
Documentation:
g
i
t
-fetch/p
u
ll updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Jon
L
oeliger
Added a few
e
xampl
e
s to git-pull man pa
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C
H
a
mano
Docume
n
t the --no-c
o
mmit flag
better
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hama
n
o
Docu
m
entation: -merge and -pul
l
: descr
i
be
merge strategies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
D
o
cumentation
:
git-ad
d
-- do
n
o
t say "cache", add examples
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C
Hamano
git
-
tag
:
D
o
not a
s
sume the w
o
rking tree roo
t
is
w
ri
t
ab
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
N
ick Hengeveld
Remove t
h
e
t
emp file if it is em
p
ty
a
f
t
er the requ
e
st
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C H
a
mano
G
I
T 0
.
99
.
9c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hama
n
o
Il
l
ustrat
i
o
n
:
"
C
omm
i
t DAG Revision Naming"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
Illustrati
o
n: "Git Di
f
f
T
ypes"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Illustration: "
F
undamen
t
al G
i
t Inde
x
Operations"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
uni
o
C Haman
o
git-merg
e
-ours:
m
a
ke sur
e
our index matches H
E
AD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
amano
A
d
d 'ours'
m
erge strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
Add --no-co
m
mit t
o
git-merge/git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Hamano
Document --since and --un
t
il optio
n
s
to rev-p
a
rse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
B
e
c
areful when der
e
ferencing tags
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Peter Eriksen
[PATC
H
]
C
le
a
n up the Sun
O
S Makefile rule
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C H
a
ma
n
o
Ignore '\r'
at
the end of line in $GIT_DIR/config
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
Juni
o
C
Ham
a
n
o
Do
n
o
t
fail on hierarchical branc
h
name
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Ha
m
a
no
M
a
ke t
e
st-dat
e
b
uildable a
g
a
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
git-clo
n
e:
d
o not forg
e
t to create origin br
a
n
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
J
unio
C Haman
o
Do
n
ot put automatic mer
g
e message a
f
ter signed-of
f
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Ju
n
io C Hamano
GIT 0
.
99
.
9b
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
Add -P to the do
c
umentation head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Martin Langhoff
cvsimport:
cv
s
ps
s
hou
l
d
be qu
i
e
t too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Martin Langhoff
c
vsimport: introduce -P <cvsps-output-file> optio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Martin Langhoff
cvsimport: catch
e
rror condition where
c
vs hos
t
disappe
a
rs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
J
u
n
i
o C
H
amano
Do not ins
t
all backward
c
ompatibility links anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
J
osef
Weidend
o
rfer
Strip any
t
r
a
i
ling s
l
as
h
on
d
estination argume
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Petr Baudis
git-
a
m
.
txt is no
s
tub
anymor
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
P
e
tr Ba
u
d
is
D
ocumentation for git-fm
t
-m
e
rge-msg
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Petr Baudis
Re
m
ove git-fi
n
dtags
.
perl
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Jon
Loeliger
Re
m
ov
e
'Previously
t
his command
was
known as
.
.
.
' messages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio
C
H
amano
Fix constness of
input in
mozilla-sha1/sha1
.
c
:
:SHA1_Update()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio C Hamano
Docum
e
nt the
use of "current directory" as pul
l
source
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio C
H
a
m
ano
Merge branch 'fi
x
es
'
commit
|
commitdiff
|
tree
2005-10-31
Linus Torvalds
A
d
d
e
x
amples f
o
r g
i
t-lo
g
documentati
o
n and others
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
J
un
i
o C Hamano
GIT 0
.
99
.
9
a
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Ham
a
no
Work around a
n
RPM
b
u
ild problem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Haman
o
Fix
rev-list documentation again (--sp
a
rse and
pathspec)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
i
o
C Hamano
U
p
date
git
-
pack-ob
j
ects docu
m
e
n
tat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Ham
a
no
Update
git-rev-list
o
ption
s
list in r
e
v
-
parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
U
p
dat
e
u
s
age string a
n
d documentati
o
n fo
r
git-
r
ev-list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Ch
r
is Shoemaker
Add to usage and d
o
cs fo
r
git-add
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Chr
i
s Shoemaker
A
d
d
t
o do
c
um
e
ntation of git
-
updat
e
-i
n
dex arg
u
me
n
t
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Chri
s
Sho
e
maker
A
dd
u
sage
s
t
a
t
ement to git-
c
heckout
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C H
a
m
a
no
GIT 0
.
99
.
9 m
a
ste
r
branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Ju
n
i
o
C Ha
m
ano
G
I
T 0
.
99
.
9
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
Document
a
t
i
on up
d
ates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
Do not mmap-co
p
y the whole thing; just use copy_fd(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
Hamano
Teach local-fetch abo
u
t lazy object directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
Fix recent documentation format breaka
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schindelin
make t5501 l
e
ss ann
o
y
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Johann
e
s Schindelin
fix multi_ack
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
o
hannes
Schi
n
delin
g
i
t-
f
etch-pack: Support multi_ack extension
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schind
e
l
in
git-upload-p
a
ck: Support the mul
t
i
_ack protocol
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
ohannes
Schindelin
Support r
e
ceiv
i
ng server ca
p
abili
t
ies
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schin
d
elin
git-
u
pload-
p
a
c
k: More effic
i
ent
u
s
a
g
e of the has_sha1
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
ohannes Sch
i
ndeli
n
Implement
an inter
o
perabili
t
y test
for
fetch-
p
ack/upload
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Jo
h
a
nne
s
Schindelin
Imp
l
e
m
ent a test for
g
it-fetch
-
pack/git-upload-pack
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Johanne
s
Schi
n
delin
Make m
a
ximal use of the remote refs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schindelin
Subject
:
[PATCH] git-fetch-pack: D
o
n
o
t use git
-
re
v
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Ha
m
an
o
g
i
t-apply -
-
numstat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoemaker@c
o
x
.
net
Add usage help to g
i
t-push
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
c
.
sho
e
maker@cox
.
ne
t
A
d
d usage
h
e
l
p
f
o
r
git-r
e
set
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next