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 branches 'jc/branch' and 'jc/rebase'
2005-11-18
Junio C Haman
o
Merge branches '
j
c/branc
h
' and 'j
c
/
rebase'
commit
|
commitdiff
|
tree
2005-11-18
Jun
i
o
C
H
amano
Rewrite rebase to use
git-fo
r
mat-pa
t
ch piped to git-a
m
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Ha
m
ano
git-branc
h
: -f t
o
forci
b
ly reset
branch head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Haman
o
Do n
o
t show
.
exe in gi
t
command list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Ham
a
no
Cyg
w
in *
m
ight* be helped w
i
th NO_MMAP
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
J
u
nio C Hamano
g
it-prune: q
u
ot
e
possibly empty $dryru
n
as
parameter
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
J
unio C Hama
n
o
g
it-a
m
:
-
-binary; document --res
u
me and
-
-binary
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Jun
i
o
C Hamano
Deal wit
h
b
i
n
a
r
y
diff output from GNU
d
iff
2
.
8
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
J
u
n
i
o C Hamano
Merge b
r
a
n
c
h
'
t
ojunio
'
o
f htt
p
://locke
.
catalyst
.
n
e
t
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Jun
i
o C Hamano
Add ap
p
roxidate tes
t
ca
l
ls
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Juni
o
C Hamano
t
e
sts: bina
r
y d
i
ff appl
i
cation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C
H
amano
d
i
f
f: -
-
f
ull-i
n
d
ex
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
J
u
nio C H
a
mano
apply: all
o
w-binary-r
e
p
lacement
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Ju
n
io C Hamano
git-
a
m: --resolve
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-16
Junio C H
a
mano
g
i
t-apply: fail if a patch canno
t
be
a
pplied
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-16
Ju
n
io C
H
a
man
o
git wrapper: basic
f
ixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
sha1_file
.
c::add_packed_git
(
)
: f
i
x type mismatc
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio
C
Ham
a
no
diff: make d
e
fau
l
t rename dete
c
ti
o
n l
i
m
i
t co
n
fi
g
urable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
D
oc
u
mentation: do not blindly r
u
n
'c
a
t'
.
gi
t
/HEAD,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Ju
n
io
C
Hama
n
o
Up
d
ate topo-ord
e
r test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Juni
o
C Hamano
apply: fix binary patch
detection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Haman
o
Merge branch 'svnup' of
http://n
e
tz
.
s
murf
.
nor
i
s
.
d
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Juni
o
C Hamano
Separate LDFLAGS and C
F
LAGS
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
Me
r
ge branch
'
sv
n
u
p' of http://netz
.
smurf
.
noris
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Juni
o
C Ham
a
no
Rename lost
+
foun
d
t
o l
o
st-found
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-13
Junio C
H
amano
D
ebian: buil
d
-depend on libexpa
t
-dev
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Ju
n
i
o C Hama
n
o
Ignore bu
i
lt git-lost+found
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
D
ocumentation
:
asciidoc sources are utf-8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Ham
a
no
Rename
.
git/lost+found to
.
git/lost-found
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Haman
o
gi
t
-
l
o
s
t
+
f
o
und
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
J
u
nio C Hamano
git-prune: prun
e
redundant pack
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C
H
a
mano
me
r
ge
-
one-file: u
s
e
empty- or common-
b
ase
condintionally
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
Document
a
tion:
g
it-apply --no-add
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
J
unio C Hamano
merge-one-file: use common as base,
i
n
stead of em
p
tiness
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
Hamano
merg
e
wi
t
h /
d
e
v/nul
l
as base
,
instead of p
u
nting O
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C
Hamano
INSTALL
:
duplicate python re
q
uirements f
r
om Makefile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Merge branche
s
'jc/sb'
a
nd 'jc/mb'
commit
|
commitdiff
|
tree
2005-11-11
Junio
C Haman
o
t
1
200: use --topo-order
to keep the sh
o
w-branch outp
u
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
amano
Ful
l
y detect unint
e
r
e
stin
g
commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hamano
git-show-bra
n
ch: tighten
m
e
rge-base co
m
putation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Add tes
t
case f
o
r mer
g
e-base
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C Hamano
m
e
rge-base: avo
i
d
unneces
s
a
r
y postpr
o
ces
s
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
Hamano
merge-base
:
fully
c
ontaminate th
e
well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
RPM:
arch
s
ubmodule needs
t
la
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
octopus: do not do
A
ND'ed m
e
rge base
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hama
n
o
A
dd --p
r
e
t
ty
=
fulle
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
unio C Hamano
Do not lo
s
e
a
uthor name in
f
ormation to l
o
c
ale
gotchas
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C
H
aman
o
Docum
e
n
t
ation
:
"host:pat
h
/to/r
e
po" is
git native over
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hama
n
o
Make git-recursive t
h
e de
f
ault strat
e
g
y for git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
J
unio C Hamano
Use 'me
r
ge-base --all' where
a
pplicable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio
C H
a
ma
n
o
Merge branch
'hold/svn'
commit
|
commitdiff
|
tree
2005-11-10
J
unio C Hamano
Merge
b
ranch 'ho
l
d/rpm'
commit
|
commitdiff
|
tree
2005-11-09
Junio C Hamano
git-apply:
d
o
not fail on b
i
nary diff w
h
e
n not applying
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
J
u
nio C Hamano
Update INSTALL
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Clean build annoyance
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
i
o
C Hamano
Fi
x
a c
o
uple
of ob
v
ious and insi
g
nificant
t
yp
o
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
g
it-am: d
o
not
lose al
r
e
ady edite
d
f
i
n
al-commit when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
Hamano
Debian: packa
g
i
n
g updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Haman
o
Tut
o
rial: do
n
ot
use '
g
it resolve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Documen
t
ati
o
n: fix dependency g
e
nerati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
H
a
mano
I
gnore mor
e
ge
n
erated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
J
unio C H
a
mano
Fix docu
m
entat
i
on
d
e
pendency g
e
nerati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio C
H
ama
n
o
Documenta
t
ion: asciidoc for
m
a
t
ting fix fo
r
git-cvsexportco
m
m
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Do not fail o
n
h
ierarchical
tagna
m
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
R
e
cover dropped
+
x
b
it f
r
om gi
t
-pull
.
sh by acciden
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
i
o
C Hama
n
o
Documentatio
n
:
t
alk about guts
o
f mer
g
e in tutor
i
a
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
H
amano
S
e
t
up r
e
mote
s
/origin
to
track all remote br
a
nches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
Haman
o
git-status: do
not mark unm
e
rged paths as
committabl
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C H
a
ma
n
o
ls-files: --others should n
o
t
s
a
y
unmerged pa
t
hs
are
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
Ham
a
n
o
Document expat
depe
n
dency when using
h
ttp-push
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C
H
a
m
ano
Merge in http-push first stage
.
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio C Hamano
Debi
a
n: test build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
F
u
rther Debian split
f
i
x
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Install asciidoc s
o
urces
a
s w
e
ll
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
n
o
P
a
c
k
a
ge spl
i
t: Debi
a
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Ham
a
no
Simplif
y
CFLAGS/DEFINES in Makefile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o C Hamano
g
i
t-fetch: fail if spe
c
i
fied refs
p
e
c does not
mat
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o
C Hama
n
o
Documentation:
p
ull/clone re
f
mapping clarification
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Hamano
g
it
-
format-patch: sill
y
typo fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hama
n
o
test
:
t
41
0
2-a
p
ply-rename fails with strict
u
ma
s
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio
C
H
a
mano
git-clone:
f
ix
l
oca
l
c
l
o
ne
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio C
H
am
a
no
init
-
db::copy
_
fi
l
e(
)
- use
c
o
p
y_
f
d()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C H
a
mano
co
p
y
.
c::co
p
y_fd(
)
-
do
n
ot l
e
ak file d
e
scriptor on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio
C
Ha
m
ano
Do
c
umentation: format-patch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
unio C
Ha
m
ano
forma
t
-patch: "rev1
.
.
" s
h
ould
m
e
a
n
"
r
ev
1
.
.
HEA
D
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C Ha
m
an
o
Documenta
t
ion: git
-
fetch
/
pull updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio C Hamano
Document th
e
-
-
no-commit flag bette
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
J
u
ni
o
C Hamano
D
o
c
umen
t
ati
o
n: -merge and -pu
l
l
: descri
b
e mer
g
e strate
g
ies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hama
n
o
Documenta
t
i
on:
git-add -
-
do not s
a
y "cache"
,
add examples
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
J
un
i
o C Hamano
git-
t
ag: Do not assu
m
e the wo
r
kin
g
tree
root is wr
i
table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
I
l
l
u
stration: "C
o
m
m
it DAG Rev
i
sion Namin
g
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C Hamano
Illust
r
a
t
i
on: "
G
it Di
f
f
T
yp
e
s
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Hamano
I
l
lustr
a
t
ion:
"Fundamen
t
al Git
Index Operation
s
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Haman
o
git-merge-ours: ma
k
e
sure our i
n
d
e
x matches
H
E
AD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
amano
Add 'ours' me
r
ge
s
trategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
Add --no-commit to gi
t
-merge/git-pul
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Hamano
Document -
-
since and --u
n
til options to rev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
Be
c
aref
u
l when dereferencing tags
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Ham
a
no
Ignore '\r' at the end
o
f l
i
ne
in $GIT_DI
R
/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Do not fail on
h
i
era
r
chical branch n
a
m
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next