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 'tg/maint-cache-name-compare'
2012-07-16
J
unio C Hamano
Merge branch
'tg/
m
aint-
c
ache-name-c
o
mpare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merg
e
branc
h
'jk/index-pack-streaming-f
i
x'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
Merge b
r
anch 'jk/ma
i
nt-commit
-
amend-o
n
ly-no-
p
ath
s
'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
i
o C Hamano
Merge branch 'cw/amend-com
m
it-without-message'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Me
r
ge bra
n
ch
'jn/makefile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
M
erge branch 'ar/clone-h
o
nor-
u
mask-at-t
o
p'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hama
n
o
Me
r
ge branch '
j
c/ap
p
ly-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
mano
Merge branch
'
cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
io C H
a
m
a
no
Merge b
r
an
c
h 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge branch 'pw/g
i
t-p4-
j
o
b
s
'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
M
erge branch
'
jk/p
u
sh-delete-ref-error-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
S
ixth batch for 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C
H
am
a
no
Merge bra
n
ch 'jc/refactor-diff-stdi
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
Me
r
g
e br
a
nch 'tg/ce-n
a
melen
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
m
ano
Merge branch '
t
b/sa
n
itize-decomposed-utf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'mm/mediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
Me
r
ge branch 'j
n
/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
M
e
rge b
r
anch 'mm
/
me
d
iawiki-f
i
le-attachme
n
ts'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge bra
n
ch '
t
r/ma
i
nt-show-walk
'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Ham
a
no
M
erge branc
h
'mz/rebase-no-mbox
'
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
R
e
duce draft releas
e
note
s
to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Sync 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
n
io
C
Hama
n
o
M
er
g
e
b
ranch 'jc/ma
i
nt
-
blam
e
-uniq
u
e-abb
r
ev' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C H
a
mano
Mer
g
e
branch 'rj/plat
f
orm-pread-may-be-t
h
read-unsaf
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Ham
a
n
o
Mer
g
e br
a
nch 'th/diff
-
no-inde
x
-
fi
x
es' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
Mer
g
e branc
h
'nd/
c
lo
n
e
-single-fix' in
t
o m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge branch
'jc/
r
ev-
l
ist-simplify-merges-first-pa
r
ent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge branch 'hv/
s
ubmod
u
le-upd
a
t
e-nuke-submo
d
ule
s
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jk/di
f
f-no-index-pager'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C
H
amano
Me
r
ge
b
r
an
c
h 'mm/verify-filename-fix' int
o
main
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C
Ha
m
ano
Merge branch 'cn
/
cherry-pick-rang
e
-d
o
cs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
branch 'jc
/
ustar-
c
hecksum-is-unsigned' i
n
to
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
M
erge bra
n
ch 'jc
/
bu
n
d
l
e-complete-no
t
ice' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C H
a
mano
Merge bra
n
ch 'jc/ls-files-
i
-dir'
i
nto m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hama
n
o
Merge bra
n
ch 'jc/reque
s
t-pul
l
-
match-tagname' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Ha
m
ano
cach
e
_name_c
o
m
p
a
r
e
(): do
not tru
n
c
ate whi
l
e comparing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply: tests fo
r
the --3
w
ay option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
n
o
rerere: make rr-cache
f
anout di
r
ector
y
honor umas
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C Ham
a
no
appl
y
: document --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: allow rerere(
)
to w
o
r
k
o
n
--3way resul
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: regis
t
er c
o
nfl
i
cted s
t
ages
to the
i
ndex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
Ham
a
no
apply
:
-
-3way with add/a
d
d conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
a
p
ply: move verify
_
inde
x
_
match
(
) h
i
gher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
ap
p
ly: plug the
t
hree
-
way merg
e
logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: fall back on three-way me
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply
:
accept -3/--3way comman
d
l
i
ne op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: m
o
ve "alr
e
ady exi
s
t
s
" logic to c
h
eck_
t
o
_c
r
eate()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
am
a
no
apply: mov
e
ch
e
ck_t
o
_cre
a
te_bl
o
b() closer to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
appl
y
: further s
p
lit load_pre
i
mage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
ano
apply: refactor "previou
s
patch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
mano
apply:
split load_preimage(
)
h
elper function o
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply:
f
actor out
checkout_target
(
) helpe
r
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply:
r
ef
a
c
t
or
read_fi
l
e_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
a
pply: clear
_
ima
g
e() clear
s
things a
b
it more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply:
a
bit
more comments
on PATH_TO_B
E
_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
mano
apply: fi
x
an incomp
l
ete comm
e
nt
i
n check_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Hamano
Merge git://g
i
thub
.
com/g
i
t-
l
10n/git
-
po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Fifth
b
a
t
ch for
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
aman
o
M
e
rge branch
'cw/help-ov
e
r-n
e
two
r
k
'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
Merge branch 'mz/empty-re
b
ase-t
e
st'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
M
erge branch 'p
w
/git-p
4
-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
r
ge bra
n
c
h '
j
s/fast-export-paths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
Merge branch 'cw/no-detaching
-
a
n
-
u
nborn
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Haman
o
Merge branch
'
vr/use
-
our-perl-in-
t
ests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Merge branch '
m
m/credential-plum
b
i
n
g'
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
Merge branch
'jc/main
t
-b
l
ame-
u
niqu
e
-abbre
v
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ha
m
ano
Merge branch 'jn/pe
r
l-makemaker-leading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge bran
c
h 'rj/platform-pread-may-
b
e-thread-unsafe
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
Merge branc
h
'mm/conf
i
g-
x
dg
'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C Hamano
Fourth
b
a
t
c
h
for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio
C Hamano
Me
r
ge branch 'nd/cl
o
ne-single-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
M
e
r
g
e b
r
an
c
h 'th/diff-n
o
-ind
e
x-fixes'
commit
|
commitdiff
|
tree
2012-07-05
J
un
i
o C
Hamano
M
e
rge
bran
c
h 'hv
/
r
emote-end-hu
n
g-up'
commit
|
commitdiff
|
tree
2012-07-02
Junio C Ha
m
ano
S
y
nc
with i18
n
-po update
s
i
n maint
commit
|
commitdiff
|
tree
2012-07-02
Jun
i
o
C Ham
a
no
M
erge br
a
nch '
m
a
int'
o
f git
:
//g
i
thub
.
com/gi
t
-l10n
/
g
it
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C H
a
mano
bla
m
e: compute a
b
b
r
eviation wi
d
th that ensures uniqu
e
n
ess
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C H
a
mano
diff-index
.
c
:
"
git diff" has no need
t
o
r
ead blob from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
ama
n
o
diff-index
.
c
:
unify handling of comm
a
nd line paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
diff-index
.
c: do not pretend paths
a
re p
a
thspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
T
hird batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
Merge branch '
f
c/git-pr
o
mpt
-
script'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
Merge b
r
anch 'js/sub
m
o
dule
-
relative'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
Merge
br
a
nch '
l
k/m
o
re-
h
elpful-status-hints'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
m
a
no
Merge branch 'lk/rebase-i-x'
commit
|
commitdiff
|
tree
2012-06-28
J
uni
o
C Haman
o
M
e
rge branch 'jc/rev
-
li
s
t-simplify-merges-f
i
rst-pa
r
ent'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
Merge branch 'hv/subm
o
dule-up
d
ate-nu
k
e-s
u
bmodul
e
s'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
Merge bra
n
ch 'nd/exclude-
w
orkarou
n
d-top-
h
eavy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'nd/stream-pack
-
objects'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hamano
Merge br
a
nc
h
'
n
d/stream
-
index-pac
k
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
m
a
no
Me
r
ge bra
n
ch '
m
m/verify-filename-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
Merge branc
h
'jk/diff-no-index-pa
g
er'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Hamano
ind
e
x-pack: D
i
sable thr
e
adin
g
on cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C
Ha
m
an
o
Second batch f
o
r 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Merge
b
ranch 'lp/no-cmd-
h
tt
p
-fet
c
h'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merg
e
branch 'cn/cher
r
y-
p
ick-rang
e
-do
c
s'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
Hamano
M
erg
e
bra
n
c
h
'l
m
/git-bl
a
m
e
-el'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o C Hamano
Mer
g
e
branch 'rs/
i
pv6-ss
h
-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
ge b
r
anch 'jc
/
ustar-
c
hecksum-is-unsigned'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge b
r
anc
h
'rs/git-bl
a
me-mapcar-mapc'
commit
|
commitdiff
|
tree
next