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
checkout -f: deal with a D/F conflict entry correctly
2009-07-18
Junio C Hama
n
o
checkout
-
f: deal
wi
t
h a D/F con
f
lict e
n
try correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-07-08
Junio C Hamano
Merge bra
n
ch 'cb/maint-fetch-refspec-wo-dst' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2009-07-08
Jun
i
o C Hamano
M
erge
b
ranch 'cf/maint-remote
-
upload
p
ack-u
s
econf
i
g
.
.
.
commit
|
commitdiff
|
tree
2009-06-30
Junio C Hamano
request-
p
ull: really disab
l
e
pager
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-22
Junio C Haman
o
Merg
e
branch 'sb/m
a
i
nt-1
.
6
.
0-a
d
d-config-fix
'
into
m
aint
commit
|
commitdiff
|
tree
2009-06-22
J
unio C
H
amano
GIT
1
.
6
.
3
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-22
Junio C H
a
mano
M
e
rge branch 'ak/
m
aint-for-eac
h
-ref-no-loo
k
up
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-06-22
Junio C Haman
o
Merge
b
ranch 'rc/mai
n
t-http-loca
l
-slot-fi
x
' into
m
a
int
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merge
branch 'cb/maint-no-double-mer
g
e' into
m
a
int
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Mer
g
e branch '
m
n/maint-iconv
-
auto
c
o
n
f
'
i
nto main
t
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merg
e
branch '
l
t
/
maint-unsig
n
ed-left-shi
f
t' into main
t
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
M
erge branch 'pb/maint-1
.
6
.
2-userdiff
-
fix' into
m
ain
t
commit
|
commitdiff
|
tree
2009-06-21
Junio C
H
amano
att
r
ibute: w
h
itesp
a
c
e set
t
o true detects all e
r
rors
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Jun
i
o C Hamano
t35
0
5: f
i
x
ab
u
s
e o
f
test_expect_c
o
de
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
J
u
nio C
H
amano
Mer
g
e branch 'maint-1
.
6
.
2
' i
n
to
m
a
in
t
commit
|
commitdiff
|
tree
2009-06-21
Junio C
H
am
a
no
Merge branc
h
'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
Juni
o
C Hamano
Merge bra
n
c
h
'mai
n
t-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-14
Junio
C
H
a
mano
Merge branch 'main
t
-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-06-14
Junio C Hamano
Merge branch 'main
t
-1
.
6
.
1' int
o
maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
Junio
C
Ha
m
ano
Merge br
a
nch
'
maint-1
.
6
.
0' into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-11
Junio C Hamano
Merge branch
'uk/
m
aint
-
1
.
5
.
3-re
b
ase-i-reflog' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-04
Junio C Haman
o
GIT 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Junio C Hamano
b
lame: correctl
y
hand
l
e a p
a
th th
a
t us
e
d
to be a directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
J
u
nio C Hamano
Upda
t
e draft release notes fo
r
1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Junio
C
Hamano
Merge branc
h
'cb/maint-1
.
6
.
0
-
xdl-merge-fix' into mai
n
t
commit
|
commitdiff
|
tree
2009-06-02
Juni
o
C
Hamano
Merge branch 'rs/m
a
int
-
gre
p
-word-regexp-fix' into
maint
commit
|
commitdiff
|
tree
2009-06-02
Junio
C Hamano
Mer
g
e b
r
anch 'sb/maint-1
.
6
.
2-opt
-
filename-fix
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
J
u
nio C
Haman
o
Merge branch 'jc/maint
-
ad
d
-p-coa
l
esce-fix'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-06-02
Junio
C Hamano
Merge b
r
an
c
h '
t
r/maint-doc-stash-p
o
p' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
P
r
ep
a
re for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Junio
C Hamano
Merge b
r
anch '
j
s/maint-no-ln-acr
o
s
s-libexe
c
-and-bi
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C H
a
ma
n
o
M
erge branch 'lt/m
a
i
n
t-diff-reduce-lstat'
in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge b
r
anch 'jm/for
m
at-
p
atch
-
no-auto-n-when-k-is-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C
Hamano
Merge
bran
c
h 'do
/
maint-me
r
ge-recursive-fix'
i
nt
o
maint
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C
H
amano
Merge
b
ranch 'jk/maint
-
1
.
6
.
0
-t
r
a
c
e-ar
g
v
'
into maint
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C
Haman
o
Mer
g
e branc
h
'
n
p
/
push-de
l
ta' int
o
maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge br
a
nch
'
ar
/
merge-o
n
e-f
i
le-
d
iag' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C
H
amano
Merge branch 'ar/unli
n
k-err'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hamano
Merge
b
r
a
nch
'jk
/
maint-add-empty' into maint
commit
|
commitdiff
|
tree
2009-05-24
Junio C
Hamano
Merge branch 'maint
-
1
.
6
.
2'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge branch '
m
aint-
1
.
6
.
1
'
into mai
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Juni
o
C Hamano
M
erge bran
c
h 'maint-1
.
6
.
0
'
i
n
to
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-17
Juni
o
C
H
aman
o
com
p
l
e
tion: enhance "current bra
n
ch" display
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio
C
Hamano
comple
t
ion: simplify "curren
t
branch" in
__git_ps1
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Jun
i
o C Hama
n
o
complet
i
o
n
:
fix PS1 dis
p
lay duri
n
g a merge
o
n detached
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
Revert "g
i
t-a
d
d
--in
t
eractive: remove hunk
c
o
a
le
s
ci
n
g"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
J
u
nio
C
Hamano
Merg
e
branch
'
maint
-
1
.
6
.
2' in
t
o
maint
commit
|
commitdiff
|
tree
2009-05-14
Junio C Hamano
Merge bra
n
ch '
m
aint-1
.
6
.
1' into
maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio
C
Ha
m
a
no
Merge b
r
anch '
m
aint-1
.
6
.
0'
i
nto maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-13
Junio C Ham
a
no
G
IT 1
.
6
.
3
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hamano
Merge branch 'm
a
int-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hama
n
o
Merg
e
branch 'jc
/
maint-r
e
a
d
-tree-multi' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hamano
Re
v
ert "checkout branch:
p
rime
c
a
che-tre
e
f
ully"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
archive-
t
ar
.
c:
s
q
u
e
lch a t
y
pe
m
ismatc
h
warni
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
Star
t
1
.
6
.
3
.
1 ma
i
ntenance series
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
J
u
nio C Hamano
Merge branch 'm
a
int-1
.
6
.
1'
i
nto ma
i
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
Merge branch '
m
aint-1
.
6
.
0' into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
Junio C Ha
m
ano
G
IT 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Junio C
H
amano
git-clean doc: the co
m
mand only
a
f
fects pa
t
hs under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
J
unio C
H
amano
Merge
branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2009-05-06
J
u
nio C H
a
mano
Mer
g
e branch '
r
j
/m
a
i
n
t-1
.
6
.
0-
s
vn-pars
e
-fix' into maint
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
M
e
r
g
e branch 'maint-
1
.
6
.
0' into main
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Sync 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-
o
fs
-
d
e
l
t
a' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hama
n
o
Merge
branch 'maint-1
.
6
.
1
'
into maint
commit
|
commitdiff
|
tree
2009-05-03
J
unio
C
Hamano
GIT 1
.
6
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge br
a
nch 'jc
/
maint-read-tree-mul
t
i' into main
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branch '
m
k/maint-apply
-
swap' into m
a
int
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o
C
Hamano
Merge branch 'mm/
m
aint-add
-
p-quit' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
H
amano
M
erge branc
h
'
l
t
/pack-obje
c
t-memus
e
' into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-03
J
unio C
Haman
o
M
erge branc
h
'
j
c
/mai
n
t-1
.
6
.
0-k
e
e
p
-pack' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
J
unio C
H
amano
Mer
g
e b
r
anch 'jc/maint-
1
.
6
.
0
-
diff-bor
r
ow-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Juni
o
C Hamano
Merge
bra
n
ch 'bs/mai
n
t-1
.
6
.
0-tre
e
-wa
l
k-prefix
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Junio C Ha
m
ano
GIT 1
.
6
.
3
-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-02
Juni
o
C Hamano
Merge gi
t
://repo
.
or
.
c
z/git-gui
commit
|
commitdiff
|
tree
2009-05-01
Junio C Ha
m
ano
M
e
r
ge git
:
/
/
git
.
k
e
rnel
.
or
g
/pub/s
c
m
/git
k
/
g
itk
commit
|
commitdiff
|
tree
2009-04-29
Ju
n
io C Hamano
Me
r
ge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2009-04-29
Junio
C
Hamano
merg
e
-recurs
i
ve: do not die on a
con
f
licting subm
o
dule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Junio C Ham
a
no
M
e
rge bran
c
h 'maint-1
.
6
.
1
' into maint
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
Merge branch 'm
a
in
t
-1
.
6
.
0' int
o
main
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Junio C Ha
m
ano
diff -c -p: do not
d
ie on submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
M
e
rge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2009-04-28
Junio C
H
amano
M
erge branch
'm
a
i
n
t
-
1
.
6
.
1' i
n
to maint
commit
|
commitdiff
|
tree
2009-04-28
J
unio C Ha
m
ano
Merge branch
'm
a
int-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
GIT 1
.
6
.
3
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
J
unio C Hamano
M
erge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-04-25
Juni
o
C
Hamano
Merge
b
ranch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-25
Jun
i
o
C
Ha
m
ano
Mer
g
e
b
ranc
h
'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
Jun
i
o
C Hamano
Makefile: i
g
nore pe
r
l/ subd
i
rectory u
n
der NO_PERL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Junio C
Hamano
Merge bra
n
ch 'jc/main
t
-read-tre
e
-mu
l
ti'
commit
|
commitdiff
|
tree
2009-04-21
Juni
o
C Hamano
Re
v
e
r
t "sta
t
_
t
rac
k
in
g
_
i
nfo()
:
only count real commits"
commit
|
commitdiff
|
tree
2009-04-21
Junio C Ha
m
ano
Merge bra
n
ch 'mk/maint-apply-s
w
a
p'
commit
|
commitdiff
|
tree
2009-04-21
Junio
C
Hamano
M
e
rge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2009-04-20
Junio C
Hama
n
o
che
c
kout branch: prime cac
h
e
-tre
e
ful
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C
H
a
m
ano
read-tree -m A
B
: prime cach
e
-
tre
e
f
r
om the switched
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
Move pri
m
e_cac
h
e_tree() to cache-tree
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C
H
amano
r
e
a
d-tree A
B: do not corrupt cac
h
e-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
Merge b
r
anch 'mm/m
a
int-add-
p
-quit'
commit
|
commitdiff
|
tree
2009-04-20
Ju
n
io C
H
ama
n
o
Sync with
1
.
6
.
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next