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 'sn/doc-typofix'
2012-07-24
J
unio
C Ham
a
no
Merge bra
n
c
h
'sn/doc-typofix'
commit
|
commitdiff
|
tree
2012-07-24
Junio C Hamano
M
e
r
ge br
a
nc
h
'tg/ce-namelen-field'
commit
|
commitdiff
|
tree
2012-07-24
Junio C
H
amano
Merge b
r
anch 'nk/maint-gitweb-
l
og-b
y
-lines'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Update draft re
l
ease
n
otes to
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
a
m
a
n
o
Sync with 1
.
7
.
11
.
3
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
i
o
C
H
amano
Gi
t
1
.
7
.
11
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
J
u
n
i
o C Hamano
Mer
g
e branch
'j
k
/p
u
sh-delete-ref-error-messa
g
e' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
M
erg
e
branch 'ar
/
clone-honor-uma
s
k-at-top'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hama
n
o
Merge branch 'cw/amend-c
o
mmit-witho
u
t
-messag
e
' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Haman
o
Merge branch 'jk/maint-commit
-
amend-only-no-paths'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io
C
H
amano
Merg
e
bran
c
h 'tg/maint-c
a
c
h
e-name
-
compare' into maint
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hamano
Merge branch 'tr/maint-show-walk' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
amano
Merge branch 'jc/refactor-diff-std
i
n' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
m
ano
M
erge bra
n
ch 'mz/empty-reba
s
e-
t
est' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-22
Junio C Haman
o
Merg
e
b
ranch '
j
s/fast-export-paths-with-space
s
' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Mer
g
e b
r
anch
'cw/
n
o-deta
c
hing
-
an-
u
nborn' int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-22
J
unio
C
H
amano
Merg
e
branch
'
v
r/u
s
e-
o
ur-perl-in-tests'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merg
e
gi
t
://bogomips
.
or
g
/g
i
t-
s
vn
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ham
a
no
Merge branch 'jk/revi
s
ion-walk-stop-at-ma
x
-count'
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Ham
a
no
Merge branch 'm
m
/config-xdg'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch
'
as/t4012-style-u
p
dates'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
H
amano
Merge
bra
n
ch 'pg/maint-1
.
7
.
9
-am-wher
e
-is
-
patch
'
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
Merg
e
branch 'jl/maint-1
.
7
.
10-re
c
urse-submodules-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
ano
Merge branch 'ms
/
d
a
emon-doc-typo'
commit
|
commitdiff
|
tree
2012-07-22
J
u
n
io C
Hamano
Merge
branch 'lk/more-h
e
lpful-status-h
i
n
t
s'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
Merge branch 'jc
/
s
ha1-name-mo
r
e'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hama
n
o
Merge bra
n
c
h 'jc/mai
n
t-f
i
l
t
er-b
r
anch-epoch-date
'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Hamano
Up
d
ate draft releas
e
notes
for
7th
b
a
tch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio
C H
a
mano
Merge branch
'
tg/maint-cache-name-comp
a
re'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge b
r
anch 'jk/index-pa
c
k-s
t
re
a
m
i
ng-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
e
rge bra
n
ch '
j
k/maint-commit-amend
-
on
l
y-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Merg
e
b
r
anch
'
cw
/
amend-com
m
it-without-message'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hamano
Merge branch 'jn/mak
e
file
-
c
l
e
anup'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Merge branch 'ar/clone-honor-u
m
ask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge bran
c
h 'jc/apply-3wa
y
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Ham
a
n
o
Me
r
ge
b
ranch 'cw/rebase
-
i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Merge bran
c
h 'pw/git
-
p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hama
n
o
Merg
e
bra
n
ch
'
pw/gi
t
-p4-
j
o
b
s
'
commit
|
commitdiff
|
tree
2012-07-14
J
u
nio C Hamano
Merge branc
h
'jk/pu
s
h-delete
-
ref-
e
rror-
m
e
s
sage'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
S
i
xth
batch for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Mer
g
e
bra
n
ch 'jc/
r
efactor-dif
f
-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C
Hamano
Merge branc
h
'tg/ce-
n
ame
l
e
n
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
io C Hamano
Mer
g
e branch
'
tb/sanitize-
d
eco
m
posed-
u
tf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Ha
m
ano
M
e
rge branc
h
'mm/mediawi
k
i-tests'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o
C Hamano
Merg
e
branch 'jn/vcs-sv
n
'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
Mer
g
e
b
ranch 'm
m
/mediawi
k
i
-
file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
M
e
rge branch 'tr/
m
aint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C
Hamano
Merge
b
ranch 'mz/rebas
e
-no-
m
box
'
commit
|
commitdiff
|
tree
2012-07-13
J
un
i
o C
Hamano
t1512
:
match the "other" object
name
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
J
unio C H
a
mano
t7003: a
d
d test to f
i
lter a bran
c
h with a
c
ommit
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Ju
n
io C Hamano
d
a
te
.
c: F
i
x
off by one
error in object
-
header date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
t1512: ignore whites
p
ac
e
s in w
c
-l
o
utput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Haman
o
Reduce d
r
aft relea
s
e notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Sync
w
ith 1
.
7
.
1
1
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Git 1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge b
r
a
nch 'j
c
/maint-blam
e
-
u
n
i
q
ue-abbrev'
int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge branc
h
'rj
/
platf
o
rm-pread-may-be-th
r
ead-unsaf
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io
C
H
a
mano
M
e
rge branch 'th/diff
-
n
o
-index-fix
e
s' i
n
to
m
aint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C H
a
man
o
Me
r
ge branch '
n
d/clone
-
single-
f
ix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ha
m
ano
Merge branch
'jc/r
e
v
-li
s
t-simplif
y
-merges-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
Hamano
Mer
g
e b
r
anch 'hv/
s
ubmod
u
le-u
p
date-nuke-submod
u
le
s
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge branch 'jk/diff
-
no-index-page
r
' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch '
m
m/
v
erify-fil
e
name-fix'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C H
a
mano
Merge branch '
c
n/
c
h
e
r
ry-pick-rang
e
-
docs
'
into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
M
e
rge
b
ranch 'jc/ustar
-
chec
k
sum-is-
u
n
signe
d
'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch 'jc/
b
undl
e
-comple
t
e-
n
otice' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e bra
n
ch 'j
c
/ls-
f
iles-i-dir' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
M
e
rge branch 'jc/reque
s
t
-
pu
l
l-match-t
a
gname' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bra
n
ch 'tg/mai
n
t
-cache-name-c
o
mpare
'
into
t
g
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
c
ac
h
e_name_
c
ompare():
do not truncate whi
l
e comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Juni
o
C Hamano
apply: te
s
ts for the --3
w
a
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
filter-b
r
anc
h
: do
not
f
orget t
h
e '@' p
r
ef
i
x to for
c
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
r
e
v
-parse
-
-disambiguate=<pref
i
x>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-parse:
A and B in
"
rev-par
s
e A
.
.
B
"
r
efer
t
o committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
r
eset: the command t
a
kes committi
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
commit-tree: t
h
e co
m
man
d
wants a tr
e
e and commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply:
-
-build-fake-ancestor exp
e
cts blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
sha1_na
m
e
.
c: add sup
p
ort for
d
isa
m
biguati
n
g ot
h
er types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Ha
m
ano
re
v
is
i
on
.
c
:
t
he "lo
g
" fa
m
il
y
,
e
x
cept f
o
r "show", ta
k
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
revisi
o
n
.
c: allow handle_revision_a
r
g()
t
o ta
k
e other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C H
a
mano
sha1_name
.
c: introduce get_sha1_com
m
ittish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1
_
name
.
c: teach lookup
c
ontext
t
o
g
et_s
h
a1
_
with_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
sha1
_
name
.
c: many short names can only be committis
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
sha1
_
n
a
me
.
c:
get
_
sha1_1
(
) t
a
kes lookup flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sha1_
n
ame
.
c: g
e
t_describe_name() by definition groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
rere
r
e: m
a
ke rr-cache fanout
d
i
rectory honor u
m
as
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
ap
p
ly: document
--3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
ap
p
l
y
:
allow rerere()
t
o
wo
r
k on --3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
regi
s
te
r
confli
c
ted stages
to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
ap
p
l
y: -
-
3w
a
y
w
ith a
d
d/
a
dd conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply
:
move verify_index_match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: plug
the three-way merge log
i
c in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: f
a
l
l
back on three-
w
ay me
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Ha
m
ano
app
l
y
: accept -3/--3w
a
y command line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: mo
v
e "already
e
xists" logic
t
o c
h
eck_t
o
_creat
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: move
check_to_create_b
l
o
b
() closer to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: fu
r
t
h
er split
load_
p
reimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
a
pply: refact
o
r "pr
e
vious patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
ppl
y
: split
load_pre
i
mage() helper functio
n
o
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
amano
apply:
f
a
ctor
out c
h
eck
o
ut_target() helper
f
u
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next