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
Rewrite rebase to use git-format-patch piped to git-am.
2005-11-18
Junio
C
H
amano
Rewrit
e
rebase to
u
se
git-form
a
t-patch
p
iped to git-am
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
J
u
n
i
o
C Hamano
Do not show
.
exe
i
n git command
list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Cygwi
n
*mig
h
t* be helped
with NO_MMAP
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Ju
n
i
o C H
a
ma
n
o
g
i
t-prune: quote p
o
ssibly
e
mpty $dryrun as par
a
meter
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Ha
m
a
n
o
gi
t
-am: --binary; docum
e
nt --resume and --binary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Deal w
i
th
binary diff output from G
N
U di
f
f
2
.
8
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Ju
n
io C Haman
o
Merge bra
n
c
h 't
o
junio
'
of http://
l
oc
k
e
.
ca
t
a
l
y
st
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Jun
i
o C H
a
mano
A
d
d
appr
o
xidate test calls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
tests
:
binary diff application
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
diff: -
-
full-inde
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Jun
i
o C Ham
a
no
apply: allow-bina
r
y
-replacement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
J
unio C
Hamano
git-am: --resol
v
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
J
uni
o
C Hamano
gi
t
-a
p
ply: fail if a patch c
a
nno
t
be a
p
plied
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Ju
n
io C
Hamano
git wrap
p
er:
b
asic
f
ixe
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Ham
a
n
o
sha1_file
.
c
:
:
add_p
a
cked_git(): fix type
m
i
smatc
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Ha
m
ano
diff:
m
ake defaul
t
ren
a
m
e
d
etection limit c
o
n
figurable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Ju
n
io C Hamano
D
o
cumen
t
ation: do not
blin
d
ly run 'cat'
.
git/H
E
A
D
,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Ha
m
ano
Update topo
-
order test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Jun
i
o C Hamano
apply: f
i
x bina
r
y patch detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
J
u
nio C Hama
n
o
Merge branch 'svnup
'
of h
t
t
p
://net
z
.
smur
f
.
noris
.
de
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C
Hamano
Separate L
D
FLAGS and CFLAGS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
Merge branch '
s
vnup' of http://net
z
.
smurf
.
n
o
ris
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Jun
i
o C
Ham
a
no
R
e
name los
t
+found to lo
s
t-fo
u
nd
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-13
J
unio
C Ha
m
a
n
o
Debian:
b
uild-depend
on libe
x
p
at-de
v
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Ha
m
ano
Ignore bui
l
t git-lost+fou
n
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C Hamano
Docu
m
e
ntat
i
o
n: asciidoc sources are utf-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hama
n
o
Rename
.
git/los
t
+found
t
o
.
g
it/lost-found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o
C
H
ama
n
o
gi
t
-
lost+found
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C Hama
n
o
git-prun
e
: prune red
u
ndant
p
acks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C H
a
ma
n
o
merge-one-file: use empty- or co
m
mon-base cond
i
n
t
io
n
ally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Ju
n
io
C
Hamano
Docum
e
nta
t
ion: gi
t
-
apply
--no-add
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
Hamano
merge-one-
f
ile: use co
m
mon as ba
s
e
, instead of emptin
e
ss
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C Hamano
merge w
i
th /dev/
n
ull as b
a
se,
i
n
stea
d
of pun
t
i
ng O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
i
o
C
H
amano
INSTALL: duplicate py
t
hon
r
equirements from Ma
k
efile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C H
a
mano
Mer
g
e
branche
s
'jc/s
b
' and 'jc/
m
b
'
commit
|
commitdiff
|
tree
2005-11-11
Junio C H
a
m
an
o
t1
2
0
0: u
s
e --topo-o
r
der to keep t
h
e sh
o
w-bra
n
c
h
output
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Fully de
t
ect
unint
e
res
t
ing commit
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ha
m
a
n
o
git-sh
o
w-branch:
tighten me
r
ge-ba
s
e c
o
m
p
utation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C
Haman
o
A
dd tes
t
c
a
se f
o
r me
r
ge-base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
amano
merge-base: avoid unne
c
essary pos
t
p
r
o
c
essi
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C Hamano
mer
g
e-base:
fully contaminate the well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C Hamano
R
P
M: arch sub
m
odule
ne
e
ds tla
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hama
n
o
oc
t
opus: do
not do
A
ND'ed merge
b
ase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Add --prett
y
=fuller
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
unio C Hamano
Do not lose author name in
f
ormation to locale go
t
chas
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C H
a
man
o
Documentation:
"h
o
st:path/to/repo" is git native over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Make git-recursive the d
e
f
ault strat
e
gy fo
r
g
it-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Use
'merge-ba
s
e
-
-a
l
l' where a
p
plicable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio
C Hamano
M
erge b
r
a
nch 'hold/svn'
commit
|
commitdiff
|
tree
2005-11-10
J
u
nio C
Hamano
Merge bra
n
c
h
'hold/rpm
'
commit
|
commitdiff
|
tree
2005-11-09
Junio C Ham
a
no
git-apply: do
not fail
on binary diff
w
hen not applying
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Ju
n
io C Haman
o
Upd
a
te
INSTALL
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o C Hamano
Clean build annoyance
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
F
ix a coupl
e
of obvious and in
s
ignificant typ
o
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C Hamano
gi
t
-am: do not lose
alrea
d
y
edited
f
inal-commi
t
when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
H
am
a
no
D
e
b
i
an: packaging u
p
dat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio C Ha
m
ano
Tutoria
l
:
d
o n
o
t
u
s
e 'gi
t
resolve
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Ha
m
ano
Documentation: fix depen
d
ency generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio C Hama
n
o
Ignore
m
ore
generat
e
d files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C H
a
mano
Fix docum
e
ntation depe
n
de
n
cy generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
un
i
o C Ham
a
no
D
o
cume
n
tation: asciidoc for
m
a
t
ti
n
g
fix for git-cvsexpo
r
tcomm
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C
H
amano
Do
n
o
t fail
on hi
e
rarch
i
cal tagnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio
C
Hamano
Recover dropp
e
d +x bit from
g
it-pull
.
s
h
by accident
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Ha
m
ano
Docume
n
tatio
n
:
talk about guts of mer
g
e in tuto
r
i
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
unio C Haman
o
S
et
up remot
e
s/o
r
igin
t
o track all rem
o
te
branches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio
C
Hamano
git-st
a
tus:
d
o not
ma
r
k unmerg
e
d path
s
as committab
l
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 say
unmerged pat
h
s ar
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Document ex
p
at dependency when using http-push
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
n
io C Ham
a
no
Merge in ht
t
p-p
u
sh first stag
e
.
commit
|
commitdiff
|
tree
2005-11-06
J
uni
o
C Hamano
Debian:
test
b
uild
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Further Debian
s
p
lit f
i
xes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Haman
o
Install asciidoc s
o
urces as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io
C Hamano
Pa
c
kage spl
i
t:
Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Simp
l
ify
C
FLAGS/DEFINES in M
a
kefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
no
git-fetc
h
: fail if specified refspec d
o
es not match
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C Hamano
D
o
c
u
m
e
ntation: pull/clone ref
m
a
pping clarificat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Hamano
git-form
a
t-
p
atch: silly ty
p
o
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
test: t4102-apply-rename fails with s
t
rict umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hama
n
o
git
-
c
l
o
n
e:
f
i
x
l
ocal clone
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C H
a
mano
init-db::copy_file() - use c
o
py_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Ha
m
ano
c
op
y
.
c::cop
y
_fd() - do not leak file descr
i
ptor
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
amano
Documentation: format-patch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
un
i
o C Hamano
format-patch: "rev1
.
.
"
s
houl
d
m
e
an "rev1
.
.
HEAD"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
a
mano
D
o
cu
m
entation: gi
t
-fe
t
c
h/pull u
p
d
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o C Hamano
Docu
m
e
nt
the --no-commit
flag better
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
Documentati
o
n: -merge and -pull:
d
e
s
c
r
ibe merge strat
e
gies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio
C
H
aman
o
Documentatio
n
: git
-
a
dd -- do not
s
a
y "cache", add
e
x
a
mples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Jun
i
o C Hama
n
o
git-tag: Do not
a
s
sume the wor
k
ing tr
e
e roo
t
is writable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
ama
n
o
Ill
u
str
a
tio
n
: "Comm
i
t DAG Revi
s
io
n
Na
m
ing"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C Hamano
Illustration: "G
i
t Diff Types"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
amano
Illus
t
ration: "Fundamen
t
al Git Index
O
perations"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
unio
C Hamano
git-merge-ours: mak
e
sure our index match
e
s HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C H
a
mano
Add 'ou
r
s' merge strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C Ham
a
no
A
d
d
-
-no-
c
ommit to gi
t
-me
r
ge
/
git-pu
l
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Do
c
ume
n
t -
-
since and --u
n
til options to rev
-
pars
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Be careful
w
hen dere
f
ere
n
cing
tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
I
gnore '\r' at the
end of line in $GIT
_
DIR/conf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
D
o not fail on hierarchical branch nam
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Hamano
Make test-date buildable
again
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Ha
m
ano
git-
c
lone: do not
f
orge
t
to create
origin branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next