repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-merge: make recursive the default strategy
2005-11-24
Junio
C Haman
o
git-merge: m
a
ke recursive the default strat
e
gy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
unio C Hamano
pa
c
k-re
d
u
ndant: t
y
pe cleanu
p
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
Merge http:/
/
www
.
kern
e
l
.
org/pub
/
scm
/
g
itk/gitk
commit
|
commitdiff
|
tree
2005-11-22
Junio
C
Hama
n
o
gi
t
-var: con
s
tn
e
ss and globalness clean
u
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
J
unio C Ham
a
no
Move
diff
.
rename
l
imit o
u
t of default configuration
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Hamano
git-prox
y
update
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
d
aemon: furthe
r
tweaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Hamano
t
u
t
orial:
setting up a
tree
for subsy
s
tem
m
a
in
t
ain
e
r
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Hamano
rename dete
c
tion with -M100 means "ex
a
c
t
r
enames onl
y
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C
H
amano
fo
r
ma
t
-patch: fix two-argumen
t
speci
a
l case, and make
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Fix
h
o
o
ks/upd
a
te temp
l
ate
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
unio C Hamano
Make sure heads/foo and tags/foo do
not c
o
nfuse
thi
n
gs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Ha
m
ano
Fix "do not DW
I
M" patch
t
o enter_repo"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Jun
i
o C Hamano
Merg
e
http:
/
/
ww
w
.
k
ernel
.
org/pub/sc
m
/gi
t
k
/
g
itk
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
merge-one-file: us
e
rm
d
ir -p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Documen
t
atio
n
:
add hooks/u
p
date
exampl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C H
a
m
a
no
Do no
t
DWIM i
n
u
serpath
l
ibrary under str
i
ct
mode
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ham
a
no
http
.
c: reo
r
d
er
t
o avo
i
d
compilation failure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
merge-rec
u
r
sive::removeF
i
le: re
m
o
v
e
e
mpty directories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio
C Hamano
m
erge-one-fil
e
: remove empt
y
directories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
D
o
cu
m
en
t
a
tion: rebase-from-internal m
i
nor updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
J
unio
C Ha
m
ano
git-repack: do not do
co
m
plex r
e
d
u
n
dancy check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Ju
n
io
C Hamano
git-count-object
s
: dc repla
c
em
e
n
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Jun
i
o
C
H
am
a
no
readrefs: grab all refs wit
h
o
n
e call to
l
s-
r
em
o
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hama
n
o
Merge http:
/
/www
.
kernel
.
org/pub/scm/g
i
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-18
J
u
nio
C Hamano
Merge branches 'jc/branc
h
' and 'j
c
/rebase'
commit
|
commitdiff
|
tree
2005-11-18
Junio C Ha
m
ano
Rewrite rebase
t
o us
e
git-format-patch pip
e
d to git-am
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Ju
n
io C Hamano
git-branch:
-f t
o
f
orcibly reset branch head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio
C
Hamano
Do not show
.
e
x
e in git
c
ommand
li
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Cy
g
win *might*
b
e helpe
d
with NO_MMA
P
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
J
u
ni
o
C Hamano
git
-
prune:
q
u
ote po
s
s
i
b
ly
e
mpty $dry
r
un as para
m
eter
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Jun
i
o C Hamano
git-am: --binary; document --resume and --binar
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio
C
Hama
n
o
Deal with binary
diff output fro
m
G
N
U diff 2
.
8
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Ham
a
no
Merg
e
branc
h
'tojunio' of
http://
l
oc
k
e
.
ca
t
alyst
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Jun
i
o C Hama
n
o
Add appro
x
id
a
te test calls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio
C Hamano
tests: binary
d
i
f
f
appli
c
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
diff: --
f
u
ll-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
apply: a
l
low-bi
n
a
r
y
-rep
l
acement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Jun
i
o
C
Hamano
git-am:
--resolved
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
J
u
nio C Haman
o
git-apply: fail
if a p
a
tch c
a
nno
t
be
a
pp
l
ied
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Juni
o
C Haman
o
git wr
a
ppe
r
:
basic fixe
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
J
unio C Hamano
sha1_file
.
c::a
d
d_packed_git(): fix
t
ype mismatch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
J
u
nio C
H
ama
n
o
dif
f
: make
d
efault r
e
name detection limit
configurable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
J
uni
o
C Hamano
Documentatio
n
: do not blindly run 'cat
'
.
git/HEAD,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio
C
H
ama
n
o
Update topo-order test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
J
unio C Hamano
apply: f
i
x bi
n
ary
pat
c
h detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
Merge b
r
anch 'svnup' of htt
p
://netz
.
smurf
.
n
o
ris
.
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C H
a
mano
S
e
p
arate LDFLAGS and CFL
A
GS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
J
u
n
i
o
C Hamano
Merge bran
c
h 'svnu
p
' of http
:
//netz
.
smurf
.
noris
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
J
u
nio C Hamano
Rename
l
ost+found to
lost-f
o
und
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-13
Junio C Hamano
Debian: build-depend on libexpat-dev
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Ham
a
no
Igno
r
e built git-lost+fou
n
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C Ha
m
a
n
o
Docum
e
ntation: asciidoc
s
o
urces are utf-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C Hamano
Rena
m
e
.
g
i
t
/
lost+found to
.
git/lost-found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Ju
n
io C Hamano
git-lo
s
t+found
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
git
-
pru
n
e: prune red
u
n
d
ant pack
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Haman
o
m
erge-one-file: use e
m
pty- or common-base
c
ondint
i
o
n
ally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
J
u
nio
C Hamano
Documenta
t
i
on: git
-
a
ppl
y
--no
-
ad
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
Haman
o
merge-one-file: use com
m
on a
s
base, ins
t
e
ad of empti
n
ess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
merge
w
ith /
d
e
v/nul
l
as base, in
s
tead of pun
t
i
ng O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hamano
INSTALL: dupl
i
cat
e
python
requiremen
t
s
f
rom Make
f
i
le
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Mer
g
e
b
ranches 'jc/sb'
and 'jc/mb'
commit
|
commitdiff
|
tree
2005-11-11
Junio C H
a
mano
t
1200: use --topo-orde
r
t
o
keep the show
-
b
r
anc
h
outp
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Full
y
detect uninterest
i
ng
commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio 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
Hamano
Add test case for
merg
e
-base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C H
a
mano
merge-base: avoid unn
e
cessary postpr
o
cessing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C
H
amano
merge-ba
s
e: f
u
lly
c
o
n
t
a
minat
e
the well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
R
P
M
:
a
rch submodule needs tl
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio
C
Hamano
octopus:
do not do AND'ed mer
g
e base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ha
m
ano
Add
-
-
p
retty=fu
l
ler
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C Hamano
D
o
n
ot lose au
t
ho
r
na
m
e information to locale gotchas
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
amano
Doc
u
mentati
o
n: "host:pat
h
/to
/
repo" i
s
git native o
v
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Ham
a
no
Make git-re
c
u
r
s
ive
t
h
e
default
s
tra
t
egy
f
or git-p
u
ll
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Ju
n
io C Hamano
Use 'mer
g
e-b
a
se --a
l
l' where applica
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
J
u
n
io
C
H
amano
Merge branch 'h
o
ld/svn'
commit
|
commitdiff
|
tree
2005-11-10
Ju
n
i
o
C Hamano
Me
r
ge branch 'hol
d
/rp
m
'
commit
|
commitdiff
|
tree
2005-11-09
J
u
n
i
o C Haman
o
git-a
p
ply: do
no
t
fail o
n
b
inary diff
when not applying
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Junio C Ham
a
no
Upda
t
e INSTALL
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o
C
Ham
a
no
C
l
ean bu
i
l
d
annoyance
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hama
n
o
Fix a couple of obvious and i
n
si
g
nific
a
n
t typo
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
H
am
a
no
git-
a
m: do not lose already edited
f
inal-commi
t
when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
D
ebian: pac
k
aging
updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Tutoria
l
:
do not use '
g
i
t resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o
C Hama
n
o
Documentation
:
fix dependency
generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o C Ha
m
ano
Ign
o
re mor
e
g
e
nerat
e
d f
i
l
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C H
a
mano
Fix document
a
tion d
e
p
e
n
d
ency
generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Documentati
o
n
: ascii
d
oc formatt
i
ng
f
ix for git-cvsexportcom
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
Hamano
Do
n
ot f
a
il o
n
hiera
r
chical tagnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
io
C Ha
m
ano
Recover droppe
d
+
x
bi
t
from g
i
t-pul
l
.
s
h
by accid
e
nt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
u
n
io C Ha
m
ano
Documentation: talk ab
o
u
t
guts o
f
merge
in tutorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C H
a
man
o
Set u
p
remotes
/
ori
g
in to track all remote branc
h
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio
C Hamano
git-statu
s
: do not mar
k
unm
e
rged pa
t
hs as co
m
mittab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
H
amano
ls-files: --other
s
s
h
ould no
t
say
u
nmerg
e
d paths
are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ha
m
ano
Document exp
a
t depend
e
ncy
w
hen
u
s
i
ng http-
p
ush
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
M
e
r
g
e
in http-push f
i
rst stage
.
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o C Hamano
D
ebian: test build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
F
urther Debian split fi
x
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
amano
Install
asciidoc sources
as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C Hama
n
o
Pac
k
age
s
plit: Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next