repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-16
Junio C Hamano
M
e
rge branch 'jk/ma
i
nt-c
o
m
mi
t
-amend-only-no
-
paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Haman
o
Merge
b
ranch 'cw/ame
n
d-commit-without-messa
g
e'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C
H
amano
M
e
r
ge bra
n
ch 'jn/makefile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hamano
Merge branch '
a
r/clone-honor-umask-at
-
top'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
io C Ham
a
no
Merge
b
ra
n
ch 'jc/a
p
ply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hamano
Merge
b
ranch 'cw/reb
a
se
-
i
-
root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
Merge bra
n
c
h
'pw/git-p4
-
m
o
ve'
commit
|
commitdiff
|
tree
2012-07-14
Ju
n
io C Hamano
Merge b
r
anch 'pw/git-p
4
-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Mer
g
e branch 'jk/push-delet
e
-ref
-
error-
m
essa
g
e'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Ha
m
a
no
S
i
xt
h
bat
c
h
f
o
r 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
M
erge branc
h
'jc
/
refactor-
d
iff
-
s
t
din'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
M
er
g
e branch 'tg/ce-n
a
melen'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
Mer
g
e
b
r
an
c
h 'tb/
s
anit
i
ze-de
c
o
mp
o
se
d
-u
t
f-8-path
n
am
e
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
r
ge branch '
m
m/mediawiki-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
Merge branch '
j
n/v
c
s
-
svn'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C
Hamano
M
erge branc
h
'mm/media
w
iki-file-attachment
s
'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hama
n
o
Merge
b
ran
c
h 'tr/maint-sh
o
w
-
walk
'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Merge branch 'mz/rebase-no-
m
box'
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Redu
c
e d
r
aft rele
a
se notes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Syn
c
with
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Git 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge bra
n
ch '
j
c/mai
n
t
-
blame-
u
nique-abbrev'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge branch 'rj/p
l
at
f
orm-pread-
m
a
y-
b
e-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e
b
ranch 'th/dif
f
-no-index
-
fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hama
n
o
Merge b
r
an
c
h 'nd/clo
n
e-sin
g
le-fix' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/rev-list
-
si
m
plify
-
merges-
f
irst-
p
arent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
M
erge bran
c
h
'hv
/
submodule-update-
n
uke-s
u
b
modules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Me
r
ge branch 'jk/
d
iff-no-inde
x
-p
a
ge
r
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
a
n
o
Merge branch 'm
m
/veri
f
y
-
filenam
e
-
f
i
x
' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge branch
'
cn/cherry-p
i
ck-r
a
n
g
e
-docs
'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge br
a
nch 'jc/
u
star-checksum-is-unsi
g
ned' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Haman
o
Merge
branch 'jc/bundle-compl
e
te-notice' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'j
c
/ls
-
fil
e
s-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
r
a
nch 'jc/request-pull-mat
c
h-tagname' into maint
commit
|
commitdiff
|
tree
2012-07-10
Junio C Haman
o
apply: tes
t
s for the
--3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
no
rerere: make rr-c
a
che fanout directory honor u
m
ask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
ap
p
ly: do
c
u
ment --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
l
y
: al
l
ow rerere(
)
t
o
work on --3way result
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: reg
i
ste
r
co
n
flict
e
d
stages to the
ind
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
apply: --3way with add
/
add co
n
flict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o C Hamano
apply: mo
v
e
v
e
rif
y
_index_match() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
ap
p
ly:
p
lug the thr
e
e-way merge l
o
gic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
a
pply: f
a
ll back on three-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
apply: accept
-3/--3way c
o
mmand line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
ano
a
p
ply: mov
e
"already exists" l
o
gic t
o
c
h
eck_to
_
cr
e
a
t
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move chec
k
_to_crea
t
e
_
blob()
c
loser to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
man
o
apply: further spl
i
t loa
d
_
preimage(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
m
a
no
a
p
p
ly: refactor "
p
re
v
ious p
a
tch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
ap
p
ly
:
split load_preimag
e
() he
l
per
f
u
nctio
n
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
n
o
appl
y
: f
a
ct
o
r
o
ut ch
e
ckout_t
a
rget
(
) helpe
r
funct
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
apply: refactor
read_file_or_g
i
tlin
k
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply
:
clear_i
m
age() clears things a b
i
t more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
ano
apply: a
b
i
t more comments
o
n P
A
TH_TO_BE_D
E
LETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply:
f
i
x
an incomplete comment in
c
h
e
ck_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Ham
a
no
M
erge
g
it://github
.
c
o
m/g
i
t-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
F
ifth
batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Haman
o
M
e
rge bran
c
h 'cw/help-o
v
er-network
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Me
r
g
e br
a
nch 'mz/empty-r
e
base-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
b
ranch 'pw/gi
t
-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merge branch 'js/fast-export
-
pat
h
s-
w
ith-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merg
e
branch
'
cw/n
o
-detac
h
ing-an-unborn
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
n
o
Merge branch 'vr/use-
o
ur-per
l
-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
Merge b
r
anch 'mm/credential-plumbing
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Ham
a
n
o
Mer
g
e b
r
a
nch 'jc/m
a
int
-
blame-unique-ab
b
rev'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
am
a
n
o
Merge
b
ranch 'jn/pe
r
l-makemaker-leading-
p
aths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
M
e
r
ge branch
'
r
j
/p
l
at
f
orm
-
p
read-may-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merg
e
branch 'mm/
c
onfig
-
x
dg'
commit
|
commitdiff
|
tree
2012-07-05
J
unio C Hamano
Fourth batch fo
r
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ham
a
no
Me
r
ge b
r
a
nch
'nd/
c
lone-
s
ingle-fix'
commit
|
commitdiff
|
tree
2012-07-05
Jun
i
o
C Hamano
Merge b
r
anch 'th/diff-no-in
d
ex-fixes
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Mer
g
e branch 'hv/remote-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio C Hamano
Syn
c
with
i18n
-
po u
p
dates in
maint
commit
|
commitdiff
|
tree
2012-07-02
Juni
o
C Hamano
Merge branch 'maint' of git://
g
i
t
h
ub
.
com/git-
l
10n
/
git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Jun
i
o C Hama
n
o
b
l
a
m
e
: compute
a
bbrev
i
ation width that
en
s
ures uniqueness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
d
i
ff-in
d
ex
.
c: "git
d
iff" has
no need to rea
d
b
l
o
b
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
diff-index
.
c: u
n
ify handling of comman
d
l
i
ne p
a
t
hs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff-index
.
c
:
do n
o
t
p
retend paths are pathspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C H
a
m
ano
Third ba
t
c
h
for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
man
o
Merge b
r
a
nch
'fc/git-prompt-
s
c
r
ipt'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hama
n
o
M
e
r
ge
branch 'js/sub
m
odule-re
l
ative'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C H
a
mano
M
e
rge branc
h
'lk/more-help
f
u
l-
s
tatus-hints'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Mer
g
e branch 'lk/re
b
a
se
-
i-x
'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
H
amano
Me
r
ge bra
n
ch 'j
c
/rev
-
list-simplify-merges-first-parent'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
no
Merge branch 'hv/subm
o
d
ul
e
-
upda
t
e-nuke-submod
u
les'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Me
r
ge br
a
nch 'nd/exclude-workaroun
d
-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C
Hamano
M
e
rge bran
c
h 'nd/strea
m
-pack-objects'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge b
r
a
n
ch 'nd
/
s
tr
e
am-index-p
a
c
k
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Me
r
ge branch '
m
m/verify-
f
i
lename-f
i
x
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
M
erge b
r
anch 'jk/
d
iff-no-index-pa
g
er'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Hamano
index-pack: Disable th
r
ea
d
ing
o
n
cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Hamano
S
econd batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
Me
r
g
e br
a
n
c
h 'l
p
/no-
c
m
d-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch
'
cn/
c
h
erry-pi
c
k-range-docs'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C Hamano
Merge branch 'lm/gi
t
-
b
lame-el'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o C Haman
o
Merge branc
h
'r
s
/
ipv6
-
ssh-ur
l
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'jc/
u
star-checksum-
i
s-unsigned'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'rs/git
-
b
l
ame-m
a
pcar-mapc'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
H
a
mano
M
erge branch 'rr/doc
-
commit'
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
mano
Merge branch 'nd/i18n-misc'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hamano
Merge branch 'nd/i18n-bra
n
c
h-
l
ego'
commit
|
commitdiff
|
tree
next