repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a new merge strategy by Fredrik Kuivinen.
2005-09-11
J
u
nio C Hamano
Add a new merge
strate
g
y b
y
Fredrik
K
uivine
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
n
io C Ham
a
n
o
'git-merge'
:
Docum
e
ntation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
Hamano
Use
Daniel'
s
read-tree in the m
e
r
ge
strategy 'resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Haman
o
Multi-
b
ackend
merge driv
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Hamano
Plug l
e
ak in D
a
niel's re
a
d-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Hamano
[PATCH] Add debugging
h
elp fo
r
ca
s
e #
1
6 to read-tree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C
H
amano
[PA
T
C
H] Disa
b
le debugging
f
r
om rea
d
-
t
r
e
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
F
i
x 'git-show-branch --list <h
e
a
d>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
u
n
io C Hamano
A
d
d
'
g
it bi
s
ec
t
r
e
play
/
log' document
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Haman
o
Kee
p
b
i
section log so that
i
t
can be replayed late
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
u
nio C Hamano
Fix copy ma
r
king fr
o
m diffcore-rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Make sure we
have leading direct
o
ries und
e
r refs/{h
e
ads
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
Haman
o
show-branch: --l
i
st and --independent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Ham
a
no
Retire support
for old environment vari
a
ble
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Adjust
.
gitignore for
b
ig rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C
H
amano
Ignore dates
t
amp-on
l
y
changes whe
n
i
n
st
a
lling
webd
o
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Squelch `removal' message from 'git reset --hard'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Haman
o
'build' scripts before installin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C
Hamano
Sho
w
all merge-base candi
d
ates f
r
om
sho
w
-
b
r
a
nch
--merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C H
a
m
ano
Do
c
u
mentati
o
n up
d
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C H
a
mano
git
--version
t
ells which versio
n
of git you have
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Ju
n
i
o
C
Hamano
Big tool renam
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Ham
a
no
GIT 0
.
9
9
.
6
commit
|
commitdiff
|
tree
2005-09-07
Junio C
H
amano
Docu
m
e
ntation up
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Juni
o
C
H
amano
Documentati
o
n up
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Fl
a
tten tools/ direc
t
o
r
y to make build p
r
ocedu
r
e si
m
pler
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio
C
Ham
a
no
mailinfo: barf an
d
exist upon nested mu
l
t
ip
a
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hamano
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-06
Junio
C Hamano
Forma
t
f
i
x for ascii
d
oc documentation ti
t
les
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Junio C
H
a
mano
Merge branch '
m
a
ster' of
.
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Re
t
ire git-clone-dumb-http
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
In
s
tall archimport-script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Ju
n
i
o C Hamano
Me
r
ge branch
'master
'
o
f
.
commit
|
commitdiff
|
tree
2005-09-04
Junio
C
Ha
m
ano
Add
c
o
py/re
n
a
m
e check for git-apply
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C
H
amano
Add a
link from upda
t
e-s
e
rver
-
info docum
e
nta
t
ion
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Ju
n
io C Ha
m
an
o
git-app
l
ymbox:
fix '-c'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-03
Jun
i
o C Hamano
Documen
t
hook
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C H
a
mano
Merge bran
c
h 'mast
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-02
J
u
nio C
H
aman
o
Mention post-update w
h
en we fi
r
s
t
tal
k
a
b
out
publishing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
J
u
nio C Hamano
scripts: equality test '==' is not
p
ortabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio
C Haman
o
git
-
checkout-sc
r
ipt: Remove unnecessary variable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Ju
n
io
C
Ha
m
ano
F
i
x
automerge m
e
ssage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C Hamano
A
d
d repository-layout document
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C Hamano
Mer
g
e refs/hea
d
s/m
a
s
ter f
r
om
.
commit
|
commitdiff
|
tree
2005-09-01
J
u
nio C Hamano
Use 'git statu
s
' now i
t
can handle initial commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
J
u
nio C
Hamano
Fix
g
it-
s
ta
t
us when HEA
D
is invalid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C
H
a
m
ano
Fix git-l
o
g-script when HEAD
i
s
i
n
v
alid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio C Hamano
Add Pine 4
.
63 h
e
lp
f
r
om Daniel
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio
C
Haman
o
M
e
rge
refs/heads/ma
s
ter from
.
commit
|
commitdiff
|
tree
2005-08-31
Junio
C Ha
m
ano
Upd
a
te tu
t
orial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio C Ham
a
no
show-b
r
anch: make it wor
k
in
a
subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C
Hamano
Merg
e
refs/heads/master from
.
commit
|
commitdiff
|
tree
2005-08-30
Jun
i
o C
H
amano
cat-file: make
i
t
work in a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Juni
o
C
Ham
a
no
D
ocument
a
i
o
n updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C H
a
ma
n
o
'git bi
s
ect
v
isualize'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C H
a
mano
Merge
r
e
fs/heads/mast
e
r
f
r
om
.
commit
|
commitdiff
|
tree
2005-08-30
Junio C
H
amano
pa
r
se-remote: trivial fix to all
o
w
r
e
f
s
/{h
e
ads,tags
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Ju
n
io C
Hamano
Merge refs/heads/maste
r
fr
o
m pa
u
lus
commit
|
commitdiff
|
tree
2005-08-30
Junio C
Hamano
Make s
u
r
e h
o
wto/
*
.
htm
l
is buil
t
as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Hama
n
o
Merge
r
efs/hea
d
s/ma
s
ter from
.
commit
|
commitdiff
|
tree
2005-08-30
Junio C Ha
m
ano
Allow
asc
i
i
d
oc for
m
atted documenta
t
ion in h
o
wto/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio
C Ha
m
ano
Merge refs/he
a
ds/m
a
ster from
.
commit
|
commitdiff
|
tree
2005-08-30
J
u
nio C Hamano
Add [HOWTO] re
v
ert/branch/rebase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
unio C
Hamano
git commit: Allow editing on al
l
occasions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Ha
m
ano
D
o
no
t
verify reverted
/
cherry-picked/r
e
based pa
t
ches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
unio
C Ham
a
n
o
Fix compilation warn
i
ngs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C
Hamano
Merge re
f
s/heads/mas
t
er from
.
commit
|
commitdiff
|
tree
2005-08-30
Jun
i
o C Hamano
Accum
u
l
ated
d
ocu
m
e
n
tation updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
unio
C
Hamano
git-repack-script
:
Add
o
p
t
ion
t
o repack all object
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Ham
a
no
Updat
e
s: sho
w
-branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
Ju
n
io C Hamano
M
e
rge refs/head
s
/master from
.
commit
|
commitdiff
|
tree
2005-08-29
Junio C Ha
m
a
no
m
a
il
i
nfo and a
p
plymbox updates
Signed-off-by:
Junio C Hamano
/ 濱野 純 <junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
Junio
C
Hamano
Document "
g
i
t
c
herry-pick" and "git revert
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
J
unio C
Hamano
Remove git
-
apply-patch-script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
Junio C
H
amano
Re
d
o "rev
e
rt" us
i
n
g
three-
w
ay me
r
ge mac
h
inery
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
J
u
nio C H
a
m
ano
Rev
e
rt "Rep
l
a
ce z
e
ro-le
n
gt
h
array
d
e
c
ls with []
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
Junio C
Hamano
M
e
r
ge
re
f
s/
h
eads/master from
.
commit
|
commitdiff
|
tree
2005-08-29
Juni
o
C Hama
n
o
Merge
refs/heads/
p
ortabl
e
fr
o
m
http:/
/
w
ww
.
cs
.
berk
e
l
ey
.
.
.
commit
|
commitdiff
|
tree
2005-08-29
Ju
n
io C Hama
n
o
Merge refs/hea
d
s/master fr
o
m
.
commit
|
commitdiff
|
tree
2005-08-29
Junio
C
Hamano
Update SubmittingPatche
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-28
Junio C Hamano
Teach
git-status-scri
p
t a
b
o
u
t git-ls-files --oth
e
rs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-28
J
u
n
io
C Hama
n
o
Show the branch name mo
r
e prominently
in "g
i
t status"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-28
Junio C Hamano
Ba
r
f
nicely
when "gi
t
p
ush" is run without parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Junio
C
Hamano
Upda
t
e Su
b
m
i
t
tin
g
Patches t
o
add MUA
specific n
o
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Junio C Hama
n
o
Merge mas
t
e
r branch changes into release candidate
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
J
u
n
i
o C
H
a
mano
Ac
c
ept -m and friends for initia
l
commits
a
nd
m
e
r
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Junio C Hamano
A
d
d how-to on
usin
g
update-hook
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Ju
n
io C Hamano
Fix pulling
into the same
b
ranch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
J
u
nio
C H
a
mano
Enable git-send-e
m
ail-script on
D
ebian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Jun
i
o
C
Hamano
Updat
e
the m
a
in docu
m
en
t
ation i
n
dex
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Junio
C H
a
mano
Merge refs/heads/master from
.
commit
|
commitdiff
|
tree
2005-08-26
J
u
nio C Hamano
Add Ab
s
t
r
act: s
u
pport
f
or h
o
wto
i
ndex genera
t
or
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-25
Junio C Hamano
Don't forget to buil
d
the howto-
i
ndex file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-25
Junio C
H
amano
Link h
o
wto doc
u
ments
f
r
om the main
git
.
txt documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-25
Jun
i
o C Ha
m
a
n
o
Sort branch names snar
f
ed from r
e
f
s
/ hierarchy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-25
Ju
n
i
o
C Hamano
P
r
e
p
are 0
.
99
.
6 bra
n
ch
.
commit
|
commitdiff
|
tree
2005-08-25
Junio C Hamano
F
ix
f
e
tching
of tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-25
J
unio C Hamano
Merge refs/
h
eads/
m
a
s
ter from
.
commit
|
commitdiff
|
tree
2005-08-25
Junio C Ham
a
n
o
Merge refs/he
a
ds/maste
r
from
.
commit
|
commitdiff
|
tree
2005-08-25
J
u
nio C Ham
a
no
Fix markup minimally to
get man pages built
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next