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 'cb/maint-no-double-merge' into maint
2009-06-22
Junio
C Hamano
Merge branch 'cb/maint-
n
o-double
-
merge' into maint
commit
|
commitdiff
|
tree
2009-06-22
Ju
n
i
o C Ha
m
ano
Merge branch 'mn/maint-iconv-a
u
to
c
onf' into mai
n
t
commit
|
commitdiff
|
tree
2009-06-22
Junio
C
H
a
m
a
no
Merge
b
ranc
h
'lt/maint
-
unsigned-le
f
t-shif
t
'
i
n
to maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merge branch 'pb/
m
aint-1
.
6
.
2-userdiff-fix' into maint
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
attr
i
bute:
w
hitespace set to true
d
et
e
c
t
s all erro
r
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Junio C
H
a
mano
t3505: f
i
x abuse o
f
test_e
x
pect
_
code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
J
unio
C
H
amano
Merge branch 'main
t
-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-06-21
J
u
nio C Hamano
M
e
r
ge bra
n
ch 'maint-1
.
6
.
1'
int
o
mai
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
J
u
nio C Hamano
Merge branch
'maint-1
.
6
.
0' i
n
to
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-14
Junio C
H
amano
M
e
rge b
r
a
nch
'm
a
int-
1
.
6
.
2' into
ma
i
nt
commit
|
commitdiff
|
tree
2009-06-14
Jun
i
o C Hamano
Merge br
a
nc
h
'maint-1
.
6
.
1'
into
m
a
i
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
Junio C Hamano
Merge branch 'maint-1
.
6
.
0
' i
n
to maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-11
J
uni
o
C Ham
a
n
o
Mer
g
e
branch 'uk/maint-1
.
5
.
3-re
b
a
s
e-
i
-r
e
flo
g
' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-04
Juni
o
C Hama
n
o
GI
T
1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
J
u
n
io C Hamano
blame: correctly handle a path that used to be a direc
t
o
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Junio
C
Hamano
Update draft release
no
t
es for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Jun
i
o C Hamano
Merge branch 'cb
/
m
ai
n
t-1
.
6
.
0-xdl-merg
e
-fix' into maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Merge branch
'rs/
m
a
i
nt-gr
e
p-word-
r
egexp
-
fix'
i
nto maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C
Hamano
Merge branch 'sb/maint-1
.
6
.
2
-
opt-filename-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
Junio
C Hamano
M
e
r
ge branch 'jc/maint-add-p-c
o
a
l
esce-fix' into maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Ham
a
n
o
Merg
e
br
a
nc
h
'tr/maint-doc-stash-pop' into main
t
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Hamano
Prep
a
re for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
J
u
n
i
o C Hamano
M
e
r
ge branch 'js/m
a
in
t
-
n
o-ln-acro
s
s
-libexec-and
-
bin
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
Hamano
Merge b
r
a
n
c
h
'
l
t/maint-di
f
f-reduce-lstat' into main
t
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o
C Haman
o
Mer
g
e
branch
'jm/format-pa
t
c
h-no-auto-n-when-k-is-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge b
r
anc
h
'do/
m
aint-merge-r
e
cursive-fix'
into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
H
a
mano
Merge branc
h
'jk
/
maint-1
.
6
.
0-trace-arg
v
' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge branch 'np/p
u
sh-
d
elt
a
' into maint
commit
|
commitdiff
|
tree
2009-05-26
J
un
i
o C
H
amano
Merge branch 'a
r
/merge
-
one-file-diag'
int
o
maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge branch
'
ar/
u
nli
n
k-err' into main
t
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o
C Haman
o
Merge branch 'jk/maint-add-empty' in
t
o
maint
commit
|
commitdiff
|
tree
2009-05-24
Junio C
H
amano
Merge branch '
m
aint-1
.
6
.
2
'
in
t
o maint
commit
|
commitdiff
|
tree
2009-05-24
J
u
nio C Hama
n
o
M
e
rge branch '
m
aint-1
.
6
.
1'
into maint-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hama
n
o
M
erge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-17
Jun
i
o
C Hamano
completion: enh
a
n
c
e
"curren
t
branch
"
di
s
p
l
ay
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Ju
n
io C Hamano
c
ompletion: si
m
plify
"current br
a
nch"
in __git_
p
s1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
com
p
letion: fix PS1 disp
l
ay during a merge on detached
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hama
n
o
Rev
e
rt "git
-
add
-
-interactive:
r
emove hunk coalescing"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Junio C Hamano
Merge branch 'maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-14
J
u
nio C Ham
a
no
Merge branch 'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
J
u
nio C Ha
m
ano
Merge bran
c
h 'maint-1
.
6
.
0
' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-13
Junio C Ham
a
no
GIT
1
.
6
.
3
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-12
Junio C
H
amano
Merge branch
'
maint-1
.
6
.
2
'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-12
Junio C Ham
a
no
Merge
branch 'jc/maint-read-t
r
ee-
m
ulti' into main
t
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Ju
n
io C Ha
m
ano
Revert "
c
hec
k
o
ut
b
ranch: prime cache-tre
e
fully
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
archi
v
e-t
a
r
.
c: squelch a type mismat
c
h wa
r
ning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C H
a
man
o
S
tart 1
.
6
.
3
.
1 m
a
intenance series
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio
C Haman
o
Mer
g
e
branch 'm
a
int-1
.
6
.
1'
in
t
o maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Ju
n
io C Hamano
Merg
e
b
r
anch '
m
aint-1
.
6
.
0' into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
J
u
nio
C
Hamano
G
IT 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Juni
o
C H
a
mano
git-c
l
e
a
n
do
c
: the
c
o
mmand only a
f
fects paths under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2009-05-06
Juni
o
C Ha
m
a
no
M
erge branc
h
'rj/maint
-
1
.
6
.
0
-
svn-p
a
rse-fix' int
o
maint
commit
|
commitdiff
|
tree
2009-05-06
Junio C Ham
a
no
Merge branch 'maint-1
.
6
.
0' in
t
o
maint
commit
|
commitdiff
|
tree
2009-05-03
J
u
n
i
o C
H
a
m
ano
S
y
n
c with GIT 1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
GIT 1
.
6
.
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Me
r
ge branch 'np
/
maint
-
no-ofs-delta
'
i
n
to maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
M
e
r
ge
b
ranch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-05-03
J
unio C Hamano
G
IT
1
.
6
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io C Ham
a
no
M
e
rge branch 'jc
/
mai
n
t-read
-
tre
e
-multi
'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-03
J
u
n
io
C
H
a
mano
M
e
rge branch 'mk/maint-apply-swap' into maint
commit
|
commitdiff
|
tree
2009-05-03
J
unio C Hamano
M
e
r
ge
branch
'm
m
/
maint
-
add-p
-
qui
t
'
into
main
t
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
Merge branch '
l
t/pac
k
-ob
j
ect-memus
e
' into
m
ain
t
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Ham
a
no
Mer
g
e bran
c
h 'jc/mai
n
t-1
.
6
.
0-keep
-
pack' in
t
o ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Juni
o
C H
a
mano
M
e
rge
branc
h
'jc/maint-1
.
6
.
0-
d
iff-borrow-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ham
a
n
o
Merge branch
'bs/maint-1
.
6
.
0
-tree-walk-p
r
e
fi
x
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Junio C Hamano
GIT 1
.
6
.
3-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-02
Junio C Hamano
Merge git://repo
.
or
.
cz
/
git-gui
commit
|
commitdiff
|
tree
2009-05-01
J
u
nio C Ham
a
n
o
Merge git:/
/
git
.
kernel
.
org/pub/scm/gi
t
k
/
gitk
commit
|
commitdiff
|
tree
2009-04-29
Junio C H
a
man
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-29
Ju
n
io
C
Hamano
merge-recursive: do not die on
a
conflicting subm
o
dule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Junio C Ham
a
no
Me
r
ge branc
h
'
m
a
int-1
.
6
.
1
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-04-29
J
unio
C H
a
mano
Merge br
a
nch 'm
a
int-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Juni
o
C Hamano
di
f
f
-
c -p: do not die
o
n s
u
bmodu
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
Me
r
ge branch
'
m
ain
t
'
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
Mer
g
e branch
'maint-1
.
6
.
1' into m
a
int
commit
|
commitdiff
|
tree
2009-04-28
Junio C H
a
mano
Merge branch 'maint-1
.
6
.
0' into main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-25
J
uni
o
C Haman
o
G
IT 1
.
6
.
3-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
Merge bran
c
h 'mai
n
t-1
.
6
.
1' into m
a
int
commit
|
commitdiff
|
tree
2009-04-25
J
u
nio C Hama
n
o
Mer
g
e branch 'main
t
-1
.
6
.
0'
i
nto
m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
Junio C H
a
man
o
Makef
i
le
:
ignore pe
r
l/
subdirector
y
u
n
der NO_PE
R
L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Juni
o
C Hama
n
o
M
e
rge br
a
nch 'jc/maint-rea
d
-tree-
m
ulti'
commit
|
commitdiff
|
tree
2009-04-21
Jun
i
o C Haman
o
Revert "
s
tat_tr
a
cking_info(): only
c
ount real commits"
commit
|
commitdiff
|
tree
2009-04-21
Junio C
Hamano
Merge branch 'mk/m
a
int-appl
y
-s
w
ap'
commit
|
commitdiff
|
tree
2009-04-21
J
u
nio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-20
Junio C Ham
a
no
checkout branch
:
prime cache-tree
fully
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio
C
Hamano
r
ead-tree -m
A
B
: prime
cac
h
e-tr
e
e fro
m
the switched
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
unio C Hamano
M
ove prime
_
c
ache_tree() to c
a
che-
t
r
e
e
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hama
n
o
re
a
d-tree A B: do
no
t
corrupt cache-tre
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
Mer
g
e br
a
nch 'mm/maint-a
d
d-
p
-
quit'
commit
|
commitdiff
|
tree
2009-04-20
J
u
nio C Hamano
Sync with 1
.
6
.
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
u
nio C Hamano
GIT 1
.
6
.
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Ju
n
io C Hamano
Merge bran
c
h 'ef/maint-f
a
st-export' into mai
n
t
commit
|
commitdiff
|
tree
2009-04-19
Junio
C
Haman
o
M
erge branch
'
mm/main
t
-a
d
d-p-q
u
it' into maint
commit
|
commitdiff
|
tree
2009-04-19
J
u
nio
C Hamano
M
e
rge branch 'lt/m
a
int-reflo
g
-
e
xpire'
i
nto
m
aint
commit
|
commitdiff
|
tree
2009-04-19
Junio C Hamano
Merge bra
n
ch 'j
c
/maint-
s
hared-literally' into maint
commit
|
commitdiff
|
tree
2009-04-18
Junio C H
a
mano
U
p
date draft release
n
otes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Junio
C
Hamano
Merge branch 'lt/bool-
o
n-off'
commit
|
commitdiff
|
tree
2009-04-18
J
u
nio C Hamano
Merge branc
h
'lt/pack-ob
j
e
c
t
-
m
emuse'
commit
|
commitdiff
|
tree
next