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 with a D/F co
n
flict entry correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-08
Junio C Hamano
Merge
branch 'cb/
m
aint-fetch
-
refsp
e
c-wo-dst' into maint
commit
|
commitdiff
|
tree
2009-07-08
J
u
nio
C
Hamano
Merge branch 'cf
/
main
t
-rem
o
te-uploadpack-useconfi
g
.
.
.
commit
|
commitdiff
|
tree
2009-06-30
Junio C Hamano
request-pull: really
d
isable pager
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
J
u
n
i
o C Hamano
Merge branch 's
b
/mai
n
t-1
.
6
.
0-add-co
n
fig-fix' into main
t
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
GIT 1
.
6
.
3
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
Jun
i
o C Ha
m
ano
Merge branc
h
'ak/maint-for-eac
h
-ref-no-look
u
p'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merge br
a
nch 'rc/m
a
int-http-loc
a
l-slot-fix' into mai
n
t
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merge branch 'cb/maint-no-double
-
mer
g
e' into maint
commit
|
commitdiff
|
tree
2009-06-22
Juni
o
C Ham
a
no
M
erge branch 'mn/maint-iconv-autoconf'
i
n
to maint
commit
|
commitdiff
|
tree
2009-06-22
Jun
i
o
C Hamano
Merge
bra
n
ch '
l
t/maint-
u
nsi
g
ned-left-shift' into maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Mer
g
e bra
n
ch 'pb/maint-1
.
6
.
2-userd
i
ff-fix' into maint
commit
|
commitdiff
|
tree
2009-06-21
J
u
nio C
Hamano
att
r
ibute: wh
i
tespace set to t
r
ue detec
t
s all errors
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
t3505: fix abuse
of test_e
x
pect_code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
Merge branch
'mai
n
t-
1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
M
e
r
g
e branch '
m
aint-
1
.
6
.
1' into
m
aint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
J
u
nio
C
Ham
a
no
Merge branch 'maint-1
.
6
.
0
'
i
n
to maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-14
Ju
n
io C Hamano
Me
r
ge
branch 'main
t
-1
.
6
.
2
'
i
n
to maint
commit
|
commitdiff
|
tree
2009-06-14
Ju
n
io C Hamano
Merge branch 'm
a
in
t
-1
.
6
.
1
'
i
n
to mai
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
Jun
i
o C H
a
mano
Merge branch 'maint-1
.
6
.
0
'
into maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-11
Junio C
Hamano
Merge branch 'uk/maint-1
.
5
.
3-rebase
-
i-re
f
log' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-04
J
u
nio C
Hama
n
o
G
IT 1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-03
Junio
C
H
a
mano
b
l
ame: c
o
r
rec
t
ly
h
a
nd
l
e a p
a
th that us
e
d to be
a
directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-02
Jun
i
o
C Haman
o
Update draft r
e
lease
no
t
es fo
r
1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-02
Juni
o
C Hamano
Merge branch 'cb/main
t
-1
.
6
.
0
-xdl-merge-
f
ix' into main
t
commit
|
commitdiff
|
tree
2009-06-02
Junio C
Ham
a
no
Merg
e
branch 'r
s
/maint-gr
e
p-word
-
regexp-fix' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-06-02
Juni
o
C
H
ama
n
o
M
e
rg
e
branch 'sb/ma
i
nt-1
.
6
.
2-opt-filename-fix
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
Junio C Ha
m
a
n
o
Merge
branch 'jc/m
a
int
-
add
-
p-coalesce-
f
ix
'
into maint
commit
|
commitdiff
|
tree
2009-06-02
Junio
C
Hamano
Merge
b
ra
n
c
h
't
r
/maint-do
c
-stash-pop
'
into maint
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hama
n
o
P
r
epare for 1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Hamano
Merge
branch 'js/maint-n
o
-ln-acr
o
ss-libe
x
e
c
-and-bin
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C Hamano
Merge b
r
a
n
c
h 'lt/maint-diff-red
u
ce-ls
t
at' into maint
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C Hamano
Merge bran
c
h
'
jm/format-pa
t
ch-no
-
au
t
o-n-when
-
k-is-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Ha
m
ano
Merge branch 'do/maint-me
r
ge-recursive-f
i
x' int
o
maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Haman
o
M
e
rge branch
'jk
/
maint-1
.
6
.
0-
t
race-argv'
into maint
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C
Ham
a
no
Merge
b
ranch 'np/push-delt
a
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-05-26
Junio C Ham
a
no
Merg
e
branch 'ar/merge
-
one-file-dia
g
'
int
o
main
t
commit
|
commitdiff
|
tree
2009-05-26
Junio C
Hamano
Merge branch '
a
r/unl
i
nk-err' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merg
e
branc
h
'jk
/
m
aint-add-empty'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge
b
ran
c
h
'maint-1
.
6
.
2'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-24
J
unio
C Hamano
Merg
e
branc
h
'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio
C
Hamano
Merge branch 'ma
i
nt
-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
c
o
mpletion: enh
a
nce "current bran
c
h
"
display
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C H
a
mano
comple
t
i
o
n: simplify "curre
n
t branch"
i
n
__git_p
s
1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Juni
o
C Hamano
com
p
le
t
i
o
n: f
i
x PS1
di
s
play d
u
ring
a
me
r
ge o
n
detached
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
Revert "git-add--in
t
eractive: remo
v
e hunk coale
s
cing"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Junio C Ham
a
no
Merge bran
c
h 'maint-1
.
6
.
2
' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-05-14
Junio C
H
aman
o
Merge branch 'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio
C Ham
a
no
Merge branc
h
'mai
n
t
-
1
.
6
.
0' into maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-13
J
unio C Hamano
GIT
1
.
6
.
3
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-12
Junio C H
a
mano
Merg
e
b
r
anc
h
'ma
i
n
t
-
1
.
6
.
2'
into maint
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hamano
M
erge
bran
c
h 'jc/maint-read-tree-mult
i
'
i
n
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
J
u
nio
C
Hamano
Revert "ch
e
c
kout branch:
p
r
i
m
e cache-tr
e
e
fully
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
a
rc
h
iv
e
-
t
ar
.
c
: squelc
h
a
type mis
m
atch warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
Start 1
.
6
.
3
.
1 maint
e
na
n
ce ser
i
es
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio
C Hamano
M
e
rge branch 'maint-1
.
6
.
1' into
m
aint-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
Mer
g
e branch 'maint-1
.
6
.
0
'
i
n
t
o m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
Juni
o
C Ha
m
ano
GIT 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Ju
n
io C Hamano
git
-
c
lea
n
doc: the comma
n
d
o
nly
affects paths under
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-05-06
Junio C H
a
mano
Merge branch 'rj/maint
-
1
.
6
.
0-svn-parse-fix' into maint
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
Me
r
ge branch 'maint-1
.
6
.
0' in
t
o maint
commit
|
commitdiff
|
tree
2009-05-03
J
unio C
H
amano
Sync with GIT 1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C Hamano
GIT 1
.
6
.
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Hamano
M
erge
branc
h
'np/mai
n
t-n
o
-ofs-de
l
ta' into maint
commit
|
commitdiff
|
tree
2009-05-03
J
unio C
Hamano
M
erge branch 'maint-1
.
6
.
1' into
m
aint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
GIT 1
.
6
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Haman
o
Merge branch
'jc/mai
n
t
-read-tree
-
multi'
into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ham
a
no
Merge b
r
anch 'mk/main
t
-apply-swap
'
into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branch 'mm/maint
-
add-p
-
quit
'
into m
a
int
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge
branch 'lt/pac
k
-
object
-
memuse' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
M
erge branch
'
j
c/mai
n
t-
1
.
6
.
0-keep-pack' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Mer
g
e bran
c
h
'
jc/m
a
int-1
.
6
.
0
-diff-borro
w
-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Ham
a
no
Merge bra
n
ch 'bs/
m
ai
n
t-1
.
6
.
0
-
tree-w
a
lk-
p
refix' into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Juni
o
C H
a
mano
GI
T
1
.
6
.
3-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-02
Junio C H
a
mano
Me
r
ge git://r
e
po
.
or
.
c
z/git-
g
ui
commit
|
commitdiff
|
tree
2009-05-01
J
unio C Haman
o
Me
r
ge git://git
.
kerne
l
.
org/
p
ub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-04-29
J
u
nio C Hamano
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-04-29
Junio C
H
ama
n
o
merge-recursive: do no
t
d
ie on a confl
i
cting
s
u
bm
o
dule
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-29
Junio C Ham
a
n
o
Merge br
a
nch 'main
t
-
1
.
6
.
1
'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2009-04-29
J
u
nio C Hamano
Merg
e
branch
'main
t
-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Ju
n
io C Hamano
d
i
f
f -c
-p:
d
o
not die on
sub
m
odule
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-28
Junio C H
a
mano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-04-28
Junio C
H
amano
Merge bran
c
h 'maint-1
.
6
.
1' into m
a
in
t
commit
|
commitdiff
|
tree
2009-04-28
Junio C Ha
m
ano
M
erge branch 'ma
i
nt-
1
.
6
.
0' into maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-25
Ju
n
io C Haman
o
GIT
1
.
6
.
3-rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-04-25
Junio
C
Ha
m
ano
Merg
e
branch '
m
aint
-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-25
Juni
o
C Hamano
M
e
r
g
e
branch 'maint-1
.
6
.
0
' into maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
Junio C Ha
m
a
n
o
Makefil
e
: ignore p
e
rl/ subdire
c
tory under N
O
_PERL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Ju
n
io C
Ha
m
ano
M
e
r
g
e bra
n
ch 'jc
/
maint-read-tree-multi'
commit
|
commitdiff
|
tree
2009-04-21
Juni
o
C Hamano
Revert
"sta
t
_tr
a
cking_inf
o
(): only count
real commit
s
"
commit
|
commitdiff
|
tree
2009-04-21
J
unio C Hamano
Merge bra
n
ch 'mk/maint-appl
y
-swap'
commit
|
commitdiff
|
tree
2009-04-21
Jun
i
o
C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-04-20
Junio C Haman
o
checko
u
t branch: prime ca
c
he-tree
f
ull
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C
H
ama
n
o
read-tree -m A B: prime cache-tree from the sw
i
tc
h
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Ha
m
ano
Mo
v
e p
r
ime_cache_tree
(
) to ca
c
he-
t
ree
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
r
ead-tree A B: do
not
corrupt cache-tr
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Ha
m
ano
Merge bran
c
h
'
m
m/
m
aint-add-p-qu
i
t'
commit
|
commitdiff
|
tree
2009-04-20
Ju
n
io C Ha
m
ano
S
y
nc with 1
.
6
.
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next