repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2008-08-21
J
u
nio
C Hamano
M
er
g
e branch 'jc/add-stop-at-s
y
mlink'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
mano
M
e
rge branch '
k
h/diff-t
r
ee'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge
b
ranch 'mg/count-
o
bjects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Merge
b
ranc
h
'mz
/
push-verbose'
commit
|
commitdiff
|
tree
2008-08-21
J
u
n
io C Hamano
Merge branch 'jc/index-extended-f
l
ags'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merg
e
b
r
a
nch 'cc/merge-
b
ase
-
many'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Merge
b
ranch
'jc
/
te
s
t-deep
e
r
'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
Me
r
ge b
r
anc
h
'js/pa
r
allel-te
s
t'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
F
i
x
"git-merge -s
b
ogo" h
e
lp text
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Update draf
t
r
e
l
ease notes for
1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
u
ni
o
C H
a
mano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Upda
t
e
d
raft release notes for 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
"
g
it-merge": a
l
low fas
t
-f
o
rwarding in a
stat-dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
completion:
fin
d
out
s
upported mer
g
e strategies correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hamano
for-e
a
ch-ref
:
cope with tags wit
h
incomp
l
ete lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio
C
H
amano
diff --check: d
o
not get
confused
by new bl
a
nk line
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
a
ma
n
o
Build-in "git-she
l
l"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
amano
Me
r
g
e
bra
n
ch 'bd/di
f
f-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
a
man
o
M
erge branch 'dp
/
hash-literally'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
amano
Merge branch 'js/checkou
t
-d
w
i
m
-local'
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Hamano
Merge branc
h
'ph/enable-threa
d
ed'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
M
erge branch
'
j
k/pager-swap'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
Merge br
a
nch '
r
s/imap
'
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C
Hamano
M
erge bran
c
h 'js/mingw-stat'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io
C
H
amano
s
h
ell: do not pl
a
y dupli
c
ated definition gam
e
s to
shrink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-19
Junio C H
a
mano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-08-19
Junio C Hamano
com
p
at:
introduce o
n
_disk_bytes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-18
Junio C H
a
m
ano
revision --si
m
plify-
m
erg
e
s: make it a no-
o
p without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-18
Junio
C
H
a
mano
r
evision --s
i
mplify-
m
erges
:
do not l
e
ave com
m
its
u
nprocessed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-18
Jun
i
o
C Hamano
M
akefile:
Allow C
C
_
L
D_DY
N
PATH to b
e
overriden
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C
H
a
mano
Start 1
.
6
.
1 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
J
unio C Hamano
Start 1
.
6
.
0
.
X maintenan
c
e series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hama
n
o
GIT
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C Hamano
Me
r
g
e
git-gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio
C
Hamano
Merge branch
'ak
/
p4'
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o
C
Hamano
tests:
us
e
$
T
ES
T
_
D
IRECTORY to
r
efer t
o
t
he
t/ directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Junio C
Ham
a
no
index: f
u
t
u
re proof for
"
extended
"
index entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio C
Hamano
Me
r
ge
git://git
.
ke
r
nel
.
o
rg/
p
ub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
r
evis
i
o
n
--sim
p
lify
-
m
erges
:
u
s
e decoration
i
nstead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
xdiff
-
inter
f
a
c
e: hide the whole "xdiff_emit_state"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Ha
m
ano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-13
Juni
o
C
Hamano
GIT 1
.
6
.
0-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio C H
a
mano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Do
n
ot talk
about "diff" i
n
re
v
-list d
o
cument
a
ti
o
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Jun
i
o C Hamano
Merge git://git
.
b
o
go
m
ip
s
.
o
r
g/g
i
t-svn
commit
|
commitdiff
|
tree
2008-08-13
Junio C Ha
m
a
n
o
Merge
bra
n
ch 'jc/pos
t
-
s
implify' into
t
r
/rev-list-
d
ocs
commit
|
commitdiff
|
tree
2008-08-13
Juni
o
C Hamano
Merge
branch '
j
c/p
o
st-simplify
'
into tr/filter-branch
commit
|
commitdiff
|
tree
2008-08-12
Junio C H
a
mano
dif
f
--check: do no
t
unco
n
ditionally complain a
b
o
u
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Junio
C
Hamano
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Jun
i
o C Hamano
Merge b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-11
J
unio
C
Hamano
Re-fix rev-list-option
s
documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Junio C H
a
mano
Me
r
ge b
r
a
nch
'
mai
n
t'
commit
|
commitdiff
|
tree
2008-08-11
Junio C
H
a
man
o
F
i
x deleting reflog
e
n
t
ries from
HEAD reflog
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-09
Junio
C Hamano
Update draft RelNotes
f
or
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Hamano
Merg
e
bran
c
h
'maint'
commit
|
commitdiff
|
tree
2008-08-09
Junio
C
Ha
m
a
no
mai
l
info: fix MIME
m
u
lti-part
m
e
ssage boundary
h
andli
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-08
Juni
o
C
H
amano
GIT-VERSI
O
N-GEN: mark the version 'dirty' o
n
ly if there
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Hamano
asciidoc markup f
i
xes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-07
J
u
nio
C Hamano
Merg
e
branch 'lt/co
n
fig
-
fsy
n
c' int
o
maint
commit
|
commitdiff
|
tree
2008-08-07
Junio C Hamano
Merge
b
ranch 'jc
/
reflog-expir
e
' into main
t
commit
|
commitdiff
|
tree
2008-08-07
Junio
C Hamano
Merge branch '
a
g/r
e
wr
i
te_one'
into maint
commit
|
commitdiff
|
tree
2008-08-06
J
u
n
io C Hamano
GIT 1
.
6
.
0-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Sync
w
ith 1
.
5
.
6
.
5
commit
|
commitdiff
|
tree
2008-08-06
J
u
nio C H
a
mano
G
IT 1
.
5
.
6
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio C
Ha
m
ano
Files g
i
ve
n
o
n
the co
m
mand
l
ine ar
e
r
e
la
t
ive to $cwd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Ha
m
ano
Me
r
g
e git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Merge
git://
g
it
.
kernel
.
or
g
/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-06
J
u
nio C Hamano
M
erge branch 'rs
/
archive-parse-
o
p
t
i
ons'
commit
|
commitdiff
|
tree
2008-08-06
Juni
o
C Hamano
f
i
x
d
iff-tree --s
t
din documen
t
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-06
Ju
n
i
o
C Hamano
R
elNo
t
e
s
1
.
5
.
6
.
5
u
pdates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-05
Jun
i
o C
H
amano
add: refuse to add working t
r
ee items beyond symlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-05
Junio C H
a
mano
update-index: refu
s
e
to add working tr
e
e items beyond
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-04
Junio C Hama
n
o
Topo-sort
b
efore --simplify-merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-03
Ju
n
io C Hamano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
Me
r
ge branch
'main
t
'
commit
|
commitdiff
|
tree
2008-08-02
J
u
nio C Ham
a
no
builtin-name-r
e
v
.
c: spl
i
t deeply
n
ested part from the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Junio C H
a
mano
revi
s
ion traver
s
al:
s
h
ow full
h
istory with merge simplification
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
J
u
nio C Hamano
re
v
ision
.
c: wh
i
tes
p
a
c
e
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
Merg
e
b
r
a
n
c
h
'maint'
commit
|
commitdiff
|
tree
2008-08-02
Ju
n
io C Hama
n
o
S
t
art 1
.
5
.
6
.
5 RelNo
t
es
to describe
a
ccumulated fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Jun
i
o C Hamano
Upd
a
te
m
y e-mai
l
a
ddress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
Documenta
t
ion: clarif
y
di
f
f --cc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Jun
i
o C
H
amano
mak
e
sur
e
parsed wildcard refspec ends with sla
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-31
Jun
i
o C Hamano
Teach --find-co
p
ies-h
a
rder to "
g
it b
l
ame"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
Fix
t
e
s
t-parse-options "inte
g
e
r
" t
e
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
Fi
x
mer
g
e
nam
e
g
e
neration in "merge in
C
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
J
unio C H
a
mano
git-merge-
o
ctop
u
s
:
u
se (merge-
b
a
se A
(
mer
g
e B C D E
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Ham
a
no
M
erge git://
r
epo
.
or
.
cz
/
git-g
u
i
commit
|
commitdiff
|
tree
2008-07-30
Junio C Ham
a
no
Tea
c
h gitlinks to ie_modified()
a
nd ce_mo
d
ified_c
h
e
ck_fs()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Ham
a
no
merge
-
base-m
a
ny: add t
r
i
v
ial
t
ests base
d
on
the documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
documenta
t
ion: m
e
rge-base
:
explain "gi
t
merg
e
-bas
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Haman
o
t7001: f
i
x "git m
v
" test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Ham
a
no
Documentati
o
n: clarify
w
h
at
i
s sh
o
wn in
"git-ls
-
fi
l
es
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
J
unio C Ha
m
ano
ls-tree docume
n
tation:
enhance notes
on subdirectory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Junio C
H
amano
Allow installi
n
g
i
n th
e
trad
i
tional w
a
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
J
u
nio C Haman
o
A
llow building wit
h
out a
n
y
git installed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hamano
GIT 1
.
6
.
0-
r
c
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Ju
n
i
o
C Hamano
m
ake sure parsed wildcard refspec e
n
ds with sl
a
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Junio C H
a
mano
Me
r
ge git
:
/
/re
p
o
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
next