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
git-am: --resolved.
2005-11-17
Ju
n
io
C
Hamano
git-am:
--resolved
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-16
Junio C
H
amano
g
i
t
-
a
pply:
fail i
f
a patch cann
o
t be applied
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-16
Ju
n
i
o C Hamano
git wrapper
:
basic fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
sha1_file
.
c
:
:add_
p
a
c
ked_git():
f
ix typ
e
mism
a
t
c
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
J
u
ni
o
C Hamano
d
iff
:
make def
a
ult rena
m
e d
e
tec
t
ion limi
t
confi
g
urable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
Documentation: do
n
o
t blindly run 'cat'
.
g
it/HEAD,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Ha
m
ano
Upda
t
e topo-or
d
er t
e
st
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Haman
o
apply:
f
i
x
bin
a
ry
p
a
tch d
e
tec
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Ju
n
io C Haman
o
Merge bra
n
ch
's
v
n
u
p
' of http://netz
.
sm
u
rf
.
n
o
ris
.
de
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
Separa
t
e
L
D
FLAGS and CFLAGS
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio
C
Ham
a
no
M
e
rge branch 'svnup
'
of http://netz
.
smurf
.
nor
i
s
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Junio C Ha
m
a
n
o
R
e
name lost+fou
n
d to
l
ost
-
fo
u
n
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-13
Jun
i
o
C
H
aman
o
D
e
b
i
an: build-depe
n
d on libe
x
pat-dev
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
Ign
o
re built g
i
t-
l
o
s
t+found
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o
C
Hamano
Documentation:
a
s
ciidoc sources are ut
f
-8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C Hamano
Rename
.
git/lost+found to
.
git/
l
ost
-
found
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Ham
a
no
git-lo
s
t+
f
ound
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o C Hamano
git-prune: prune redu
n
dant packs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
m
e
r
g
e
-on
e
-file
:
use empty- or c
o
mmon-base
cond
i
nt
i
onally
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C H
a
mano
Docu
m
e
n
t
a
tion:
g
it-appl
y
-
-no-a
d
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
J
u
nio C Hama
n
o
merge-on
e
-f
i
le: use common
a
s base, ins
t
e
a
d of emptiness
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
Ham
a
no
merge with /de
v
/null
a
s base
,
instead of punting O
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C
H
aman
o
INSTALL: dupl
i
ca
t
e pytho
n
r
equireme
n
ts fro
m
Makefile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C Hamano
Merge br
a
nche
s
'jc
/
sb'
a
nd 'j
c
/mb'
commit
|
commitdiff
|
tree
2005-11-11
J
u
n
i
o C Hamano
t1200: use
-
-
t
o
po-o
r
d
er to keep the show-bra
n
ch outp
u
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Fully d
e
tect uninteresti
n
g commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
git-show-branch: tighten merge-b
a
se computation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C
Haman
o
Add test cas
e
f
o
r merge-base
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
merge-
b
ase: avoid unnecessa
r
y postpr
o
cessin
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
unio C Hama
n
o
merg
e
-base: fully c
o
n
t
aminat
e
t
h
e we
l
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
RPM:
ar
c
h submodul
e
nee
d
s tl
a
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hama
n
o
oct
o
pus: d
o
n
o
t
do AND'e
d
merge b
a
se
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
un
i
o C Hamano
Add --pretty=fuller
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C
Hamano
Do not
l
os
e
a
u
thor name information to local
e
gotchas
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Documen
t
a
tion: "host:path/to/
r
epo" is g
i
t native over
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Juni
o
C Ha
m
a
no
Make git-recursive
t
h
e
defa
u
lt strategy for git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Use 'merge-base --all'
where ap
p
licabl
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio C H
a
mano
Me
r
ge branch 'hold/
s
vn'
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
M
erge branch '
h
old/r
p
m'
commit
|
commitdiff
|
tree
2005-11-09
Junio C
H
a
m
ano
git-apply
:
do not fail on bina
r
y
d
i
ff w
h
en not applying
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Junio C Hamano
Update
INSTA
L
L
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
Hamano
C
l
ean
b
uild ann
o
yance
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C Hamano
Fix a c
o
uple
of ob
v
ious
a
nd in
s
ignif
i
can
t
ty
p
o
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
J
unio C Haman
o
git-am: do n
o
t lose already edited fin
a
l-com
m
i
t when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Ha
m
ano
Debian: pac
k
aging updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io C Hamano
Tu
t
ori
a
l: do not use
'
git resolve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C Hamano
Documentation
:
f
i
x dependency g
e
ner
a
t
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio C Ham
a
no
Ignore more generated fi
l
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Haman
o
Fix docume
n
t
a
t
i
on
dependency
g
eneration
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio C Hamano
Docu
m
entation: asciidoc
f
ormatti
n
g fix for git-cvsexportcomm
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
Hamano
D
o not fail on hierarc
h
ical tagna
m
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hama
n
o
Rec
o
ver dropped +x bit fro
m
git-pull
.
sh by
accident
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
Documentatio
n
: talk about guts of merge in tutorial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
i
o
C Hamano
S
e
t up remotes/origin to tr
a
ck all
remo
t
e branch
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
H
amano
git-status:
do not mark unmerged
path
s
as committable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
Hamano
ls-files:
-
-other
s
should n
o
t say unmerge
d
paths are
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Document
e
x
p
at depend
e
n
cy when
us
i
n
g
http-push
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
Ham
a
no
Mer
g
e in ht
t
p-push first stage
.
commit
|
commitdiff
|
tree
2005-11-06
Junio C H
a
mano
Debian: t
e
st build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C Hamano
Further Deb
i
an split
f
i
x
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Haman
o
Install
a
s
ciidoc
s
ources as we
l
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Haman
o
Pac
k
age split: D
e
b
i
an
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Hamano
S
implify CF
L
AGS/D
E
F
I
N
ES in Makefile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
Ha
m
ano
git-fet
c
h: f
a
il if specified ref
s
pec do
e
s no
t
match
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Documenta
t
ion: pull/
c
lone ref mappi
n
g cl
a
rificati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C Hamano
git
-
format-patch: silly
typ
o
f
ix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C Hama
n
o
test: t4102-apply-rename fa
i
ls with strict u
m
a
sk
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o C Hamano
g
i
t
-
c
lone:
f
ix local clon
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio C
H
ama
n
o
init-db::copy_fi
l
e()
-
use copy_fd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
copy
.
c::copy_f
d
(
)
-
d
o
n
o
t leak file descrip
t
o
r on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
n
io C Hamano
Documen
t
ation:
f
ormat-
p
atc
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hama
n
o
fo
r
m
at-pat
c
h
:
"r
e
v1
.
.
" sh
o
ul
d
mean "rev1
.
.
HEAD"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hama
n
o
Documentation: git-fetch/pull updat
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
n
i
o C Ha
m
ano
Docum
e
nt the -
-
no-commit flag bet
t
er
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
J
unio C Ha
m
a
no
Document
a
tion: -m
e
r
g
e a
n
d
-
p
u
ll: describe merge strategie
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio
C Ham
a
n
o
Documentation: g
i
t-a
d
d -- do not say "cache", ad
d
e
xamples
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
J
unio
C Hamano
git-ta
g
: Do not assum
e
the w
o
r
k
ing tree root i
s
writabl
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
i
o
C
H
aman
o
I
llustration: "C
o
mmit DA
G
Revision N
a
m
i
ng"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
i
o C Hamano
Il
l
us
t
r
ation: "Gi
t
Diff Types"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
Illustration: "Fundamental
Git In
d
e
x
Op
e
ration
s
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
n
io
C
Ha
m
ano
g
it-mer
g
e-ours: make sure
our index matches HEA
D
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
uni
o
C Hamano
A
d
d
'ours' merge strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
A
d
d
--no-commit to git-me
r
ge
/
git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
D
o
cument -
-
since and --until options to rev-
p
arse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
Be ca
r
ef
u
l when derefe
r
encing tag
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
I
g
n
o
re '\r' a
t
the end of line in $GIT_DIR/co
n
f
i
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Do not fail on hi
e
rarchic
a
l branch na
m
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C
Hama
n
o
Make
t
e
st-date
b
uildable again
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Ju
n
io C Ha
m
ano
git-
c
lo
n
e
:
d
o
not forget to create or
i
gin branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
J
unio
C Hamano
Do not put automat
i
c merge
m
essa
g
e after
s
igned-off
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Ju
n
i
o
C Hamano
Add -P to the d
o
cumentation head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
J
u
nio C H
a
mano
Do
n
ot install b
a
ckward
c
omp
a
tibil
i
ty links anymore
.
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/
s
ha
1
.
c::SHA
1
_Update()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
J
u
ni
o
C Hamano
Docu
m
ent the use of "c
u
rrent director
y
" a
s
p
u
l
l source
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C
Hamano
Work aro
u
nd an
RPM build
p
roblem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Jun
i
o C Hamano
Fix rev-list d
o
cum
e
ntation again (--sparse
a
nd pa
t
h
s
pec)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C
Ha
m
a
n
o
Up
d
ate git-
p
a
c
k
-
objec
t
s
documentat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Update g
i
t-rev-list options list in
rev
-
p
a
rse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Ha
m
ano
Update
usage string and
documentation for
git-rev-list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Juni
o
C Ha
m
ano
GIT 0
.
99
.
9
master br
a
nch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next