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
Tutorial: adjust merge example to recursive strategy.
2005-11-11
Junio C Hamano
A
d
d
t
est
c
a
se for m
e
rge-bas
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
Hamano
merge-base: a
v
oid unnecessar
y
p
ostproce
s
sin
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C Haman
o
merge-base: fully
c
o
ntaminate th
e
well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ha
m
a
n
o
RPM: arch subm
o
dule n
e
eds tla
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
amano
oct
o
p
us: do not do
A
ND'ed me
r
ge ba
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C H
a
mano
Add --pretty=fuller
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Haman
o
Do not
lose au
t
hor name
information to loca
l
e go
t
chas
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
unio C Hamano
Documentat
i
on: "host:
p
at
h
/to/repo" is git
nat
i
ve over
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
J
unio C Hamano
M
a
ke git-recursi
v
e the defau
l
t
strategy for git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Jun
i
o C Hamano
U
se 'merge
-
b
ase --all' where ap
p
licable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio
C
Hamano
Mer
g
e
branch 'hold/svn'
commit
|
commitdiff
|
tree
2005-11-10
Junio C Haman
o
M
erge
branch 'hold/rpm'
commit
|
commitdiff
|
tree
2005-11-09
Ju
n
io C Hamano
git-a
p
ply: do n
o
t fai
l
on binary dif
f
wh
e
n not apply
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Junio
C
Hamano
Update INSTALL
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Cl
e
an build annoyan
c
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Fix a couple of
obvious and i
n
sign
i
f
icant typo
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Ham
a
no
git-am: do not lose already e
d
ite
d
f
i
nal-commi
t
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Debian: pa
c
kaging updat
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
J
unio C Hamano
Tutoria
l
: d
o
no
t
use 'gi
t
resolve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Documentation: fix dependency
generatio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
Ha
m
ano
Ignore more gener
a
te
d
files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Ha
m
a
no
Fix docum
e
ntation d
e
pende
n
cy generati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o
C Hamano
Do
c
u
m
e
n
tation
:
a
s
ciidoc formatting fix for git-
c
v
se
x
portcomm
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Do not f
a
il on hierarc
h
i
c
al t
a
g
names
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Juni
o
C Ha
m
ano
Reco
v
er dropped +x bit from git-pull
.
s
h
by accident
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Jun
i
o C Hama
n
o
Documentat
i
on: ta
l
k
about gut
s
o
f
merge in tutorial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
J
unio
C
Hamano
Set up remotes/origin to track all r
e
mote branches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
Hamano
g
it-status: do not mark unmerged pat
h
s a
s
committable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Juni
o
C Hamano
ls-fi
l
es: --others should n
o
t sa
y
unmerged paths ar
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
Hamano
Docume
n
t expat dependency when
u
sing http-
p
ush
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Merge in http-
p
u
sh first stag
e
.
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
D
ebian: test b
u
i
l
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
n
o
Further
D
ebian
s
p
l
it fix
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
H
amano
Install asciid
o
c
s
o
urces as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
u
n
io
C Haman
o
P
ackage split: Debian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ha
m
ano
Simplify
C
FLAGS/DEFINES in Makefi
l
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
Hamano
g
it-fet
c
h:
f
a
il
if specified refspec d
o
es not
m
atch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C
Hamano
Documentation: pull/clon
e
ref ma
p
ping clarifi
c
ation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
no
git-
f
orma
t
-
patch: silly
t
ypo fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o C Ha
m
ano
test
:
t4102-
a
pply-re
n
ame fails with strict umas
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
git-c
l
one: fix
l
ocal 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_f
d
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C H
a
mano
copy
.
c::
c
opy_fd(
)
-
d
o not leak file descriptor on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Ju
n
io C Ham
a
no
Do
c
umen
t
ation: format-patch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C Hamano
fo
r
ma
t
-patch: "rev1
.
.
" sh
o
uld m
e
an "r
e
v1
.
.
HEAD
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio C Ham
a
no
Document
a
tion: git-fetch/pull updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
Docu
m
ent the --no-c
o
mmit flag better
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C H
a
ma
n
o
Documentation: -merge and -pull: describe merge
strategies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
J
u
ni
o
C
Hamano
D
ocumentation: git
-
add -- do not say "cache", ad
d
e
x
amples
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C
H
amano
git-
t
a
g: Do not assume the working
tree root is writ
a
ble
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Haman
o
Illustration: "Comm
i
t DAG
R
e
visi
o
n N
a
m
i
ng
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ha
m
ano
Illustration:
"
Git Diff Types"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Haman
o
Illustrat
i
o
n
: "Fundame
n
tal Git Ind
e
x Operations"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C Ham
a
n
o
git-mer
g
e-ours:
make su
r
e
o
ur
index matc
h
es HEAD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Haman
o
Add 'ours' me
r
ge strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ham
a
no
Add --n
o
-commit
t
o git
-
merge/
g
it-pul
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
Document --since a
n
d --until opt
i
o
ns to r
e
v-pars
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
amano
B
e
c
areful when de
r
e
f
e
r
e
ncin
g
tags
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Hamano
Ignore '\r
'
a
t
the end
o
f line in $GIT_D
I
R/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Do not fail
o
n
h
ier
a
rchical branch n
a
mes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C
Hamano
Make test-date buildable ag
a
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Ham
a
n
o
git-clone:
do not for
g
et to create origi
n
branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
Do no
t
put automatic merge
m
essage after signed-off
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio
C
Hamano
Add -P to the
do
c
u
mentat
i
on head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
Do no
t
i
n
stall backward compatibil
i
t
y links anymo
r
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Ju
n
io C H
a
mano
Fix con
s
tnes
s
of inpu
t
in mozilla-sha1/sha
1
.
c::SHA1_Update()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio
C Hamano
D
oc
u
me
n
t
the use of "cu
r
rent direct
o
ry" as
p
u
l
l source
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
io
C
Hama
n
o
W
ork ar
o
und an RPM build problem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Jun
i
o
C Hama
n
o
Fix rev-
l
ist
doc
u
mentat
i
o
n again
(--
s
pa
r
s
e
and pathspec)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio
C
Hamano
Update
g
it-pa
c
k-o
b
jects docum
e
ntati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
io C Hama
n
o
Update git-re
v
-list options list in rev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Update usage st
r
i
n
g a
n
d documentati
o
n f
o
r
git-rev-list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
GIT
0
.
99
.
9
m
a
ster 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 Hamano
Do
c
umentation upd
a
tes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Ju
n
io C Hamano
Do not m
m
ap-copy the whole thing;
j
ust use cop
y
_
fd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Juni
o
C Ha
m
ano
Teach local-fetch about lazy obj
e
ct directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Ju
n
io C Hamano
F
i
x
recent
d
o
cum
e
ntati
o
n format b
r
e
akage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
unio
C
Hamano
git-apply --n
u
mstat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Junio C H
a
mano
Docu
m
ent git-patch-
i
d a bit better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-27
Ju
n
io C Hamano
Merge
branch 'js-fat'
commit
|
commitdiff
|
tree
2005-10-27
Junio C
H
a
mano
Merge
branch
'
lt-de
n
s
e
'
commit
|
commitdiff
|
tree
2005-10-27
Junio C
H
a
ma
n
o
M
e
rge http:/
/
www
.
kern
e
l
.
org/pub/scm/gi
t
k/git
k
commit
|
commitdiff
|
tree
2005-10-26
Juni
o
C Hamano
p
a
ck
-
o
bjects: Allow use of pr
e
-ge
n
erated pack
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio C
H
amano
upl
o
ad-pack: ti
g
h
ten re
q
u
e
st valid
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio C
Hamano
A
d
d [v]iew pa
t
ch
in gi
t
-a
m
intera
c
tiv
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio
C
Hamano
git-am: make it easier after fixi
n
g up an
u
napp
l
icable
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-25
Junio C Hama
n
o
Rev
e
rt recent f
e
tch-pack/upload-pack update
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-24
Junio C Hamano
u
pload
-
pack: fix th
i
nk
o
in common-
c
ommi
t
finder code
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-24
Junio C Haman
o
C
larify git sta
t
us
o
utput
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-23
Junio
C Hamano
Merge branch
'fixes'
commit
|
commitdiff
|
tree
2005-10-23
Junio C Hama
n
o
git-
s
h
o
w-
b
ranch:
F
ix off-by-one error
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Junio
C Hamano
A
l
low git-me
r
ge not to com
m
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Junio C Hamano
upload-pack:
I
ncrease
M
AX_
H
AS
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Junio C Hamano
Fi
x
malformatted
g
i
t-am do
c
umentat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hama
n
o
Merge branch 'fixe
s
'
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hamano
daemon
.
c
: r
e
mo
v
e
trailing wh
i
tespace
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Juni
o
C Ha
m
ano
Finish git-am documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Ju
n
io C
Ha
m
ano
F
i
x
m
issing ex
p
orts in
git
-
am
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
Ju
n
io C Ha
m
ano
Make
sure we b
a
rf
on ref^{t
y
pe}
failure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next