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 'jc/sha1-name-more'
2012-07-22
J
unio C Hamano
M
e
r
ge branc
h
'jc/sha1
-
name-more'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Merge branch 'jc
/
m
a
int-
f
ilter-branch-epoch-
d
ate'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C
Hama
n
o
U
pdate draf
t
release n
o
t
es
for 7th
bat
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio
C
H
a
mano
M
e
rge b
r
a
nch
'
t
g/maint-
c
ach
e
-name-compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
ano
Merge branc
h
'
j
k/index-pack-
s
tream
i
ng-fi
x
'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
Merg
e
b
r
anch 'jk/maint-commit-amen
d
-o
n
ly-no
-
path
s
'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hama
n
o
Me
r
g
e
br
a
n
c
h
'cw/ame
n
d-commit-without
-
message'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
a
n
o
Merge branch
'
jn
/
makef
i
le
-
cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
ano
Merge
b
ranch
'
ar/c
l
one-honor
-
umask-
a
t
-
top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
a
man
o
M
e
rg
e
bra
n
ch 'jc
/
a
p
ply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch
'cw/reb
a
se-i-root'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Mer
g
e bran
c
h 'pw/git
-
p4-mo
v
e'
commit
|
commitdiff
|
tree
2012-07-14
Ju
n
i
o
C Hamano
Mer
g
e b
r
an
c
h 'pw/gi
t
-p4-job
s
'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hama
n
o
Merge b
r
anch 'jk/push-delete-ref-
e
rror-message'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
Si
x
t
h bat
c
h for 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Mer
g
e branch
'
j
c
/refactor-diff-
s
tdin'
commit
|
commitdiff
|
tree
2012-07-13
J
unio
C
H
amano
Merg
e
b
r
anch 'tg/c
e
-namel
e
n'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio
C
Hamano
Merge branch
'tb/san
i
t
i
z
e
-decomp
o
s
ed-ut
f
-8-p
a
thnam
e
'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o C
H
amano
Merge branch 'mm/
m
ediawik
i
-tests'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Ha
m
a
no
Merge branch 'jn/
v
cs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
branch 'mm/med
i
awiki-file-a
t
tac
h
ments'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Ha
m
ano
Merg
e
br
a
n
ch 'tr/maint-
s
h
o
w
-walk'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Merge branch 'mz/rebas
e
-no
-
mbox
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
t151
2
: mat
c
h t
h
e "other" o
b
ject na
m
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Ha
m
ano
t7003:
a
dd
t
e
s
t
to fi
l
ter a bran
c
h with
a
commit at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
J
uni
o
C H
a
mano
d
ate
.
c: Fix off by one erro
r
in object-hea
d
er
d
ate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Ha
m
ano
t
1512: ignore whitespaces in
wc -
l
o
utpu
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C
H
ama
n
o
Reduce dra
f
t release notes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Sync with
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o C Hama
n
o
Git 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge branch '
j
c/maint-blam
e
-un
i
que-abbrev' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
Merge branch 'rj/p
l
atform
-
pread-may-be-thread
-
u
n
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
br
a
nch '
t
h
/
diff-no-index-fi
x
es' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
M
e
rge br
a
nch 'n
d
/clo
n
e
-
s
ingle-fi
x
' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ham
a
no
Merge bra
n
ch '
j
c/rev-list-si
m
p
l
i
f
y-merges-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge branch 'hv/submodu
l
e
-
u
pdate-nuke-subm
o
dules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Merg
e
br
a
nc
h
'jk/
d
iff-
n
o-index-pager' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
ranch '
m
m/verify-filename-fix' into
m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'cn/cherry-pick-range
-
docs'
into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Ha
m
a
no
Merge branc
h
'jc/u
s
tar-checksum-is-unsigned' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
r
a
nch 'jc/bundl
e
-complete-n
o
tice
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Me
r
ge br
a
nch
'
jc/ls
-
f
iles-i-dir' int
o
main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Me
r
ge branch 'jc/request-pull-match-
t
agnam
e
' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
Hamano
cac
h
e_nam
e
_compare()
:
do not
truncate while compa
r
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Juni
o
C Ha
m
ano
a
pply:
t
ests for the --
3
w
a
y
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
J
u
nio C
H
a
mano
filter-branch: do not forget the '@
'
prefix to force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io
C
Hamano
re
v
-parse --dis
a
mb
i
guate=
<
pref
i
x>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
n
o
rev-pars
e
:
A
an
d
B in "re
v
-
p
a
rse A
.
.
B
" r
e
f
er to commi
t
ti
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
reset: t
h
e command takes
c
omm
i
ttish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hama
n
o
com
m
it-tree: the
co
m
ma
n
d wants a tre
e
and co
m
mits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
apply: --bui
l
d-fake-
a
n
c
esto
r
expects
b
lobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Hamano
sha1_name
.
c: a
d
d support for disambiguatin
g
o
t
h
e
r ty
p
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
revision
.
c
:
the "
l
og" fa
m
ily, exc
e
p
t
f
o
r "s
h
ow", tak
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
re
v
ision
.
c: allow handle_
r
evision_arg() to
t
ake o
t
her
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_n
a
me
.
c: introduc
e
get_
s
ha1
_
committish(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_nam
e
.
c
:
teac
h
l
o
oku
p
context to get_sha1_with
_
cont
e
xt()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Haman
o
sh
a
1
_
name
.
c: many s
h
ort name
s
can o
n
ly be co
m
mittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
mano
sha1_nam
e
.
c: get_sha1_1() t
a
kes
looku
p
flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
sh
a
1_name
.
c
:
get_
d
escribe_nam
e
() by d
e
finition
groks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rerere: make rr-
c
ache fanout directory
honor u
m
ask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
a
pply: d
o
c
ument --3w
a
y
o
ptio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply:
a
llow rerere()
t
o work on --3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
a
pply: register conflicte
d
stages t
o
t
he in
d
ex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: --3
w
ay with
a
dd/add conflic
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: mo
v
e v
e
rify_index_
m
atch() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
:
p
lug the
t
hree-way merge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
apply:
fa
l
l back
o
n
thr
e
e
-
way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: accept -3/--
3
way com
m
and line
o
pt
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Ha
m
ano
apply:
move "already exists" logic t
o
c
heck_to_creat
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: move c
h
e
c
k_to_c
r
eate_blob()
closer to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
ap
p
ly: fu
r
th
e
r split lo
a
d_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: re
f
a
c
tor "previo
u
s patc
h
"
logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
:
s
pl
i
t load_preimage() helper
f
unction out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
a
pp
l
y:
f
a
c
t
or out ch
e
c
kout_ta
r
get() helper fu
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refactor read_file_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
apply: clear_image() c
l
ears
t
hings
a bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C Ha
m
ano
apply:
a bit mo
r
e commen
t
s on PATH_TO_BE_
D
ELE
T
ED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
a
p
p
ly: f
i
x an incomplete comment in check_p
a
tch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge git:/
/
g
i
thub
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Fifth batch fo
r
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge branch 'cw/help-over-
n
etwork'
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o C Ham
a
no
M
erge branch 'mz/empty-reb
a
se
-
test'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Mer
g
e bra
n
ch 'pw
/
gi
t
-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
m
an
o
Merge
b
ran
c
h
'
j
s/fast-
e
x
port
-
paths-w
i
th-spac
e
s'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
M
e
rge branch 'c
w
/no-detac
h
ing-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge b
r
anch 'v
r
/use-
o
ur-perl-
i
n
-
tes
t
s'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge bra
n
ch 'mm/crede
n
tial-
p
l
u
m
b
i
n
g'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Mer
g
e bran
c
h 'jc/maint-blame
-
unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ham
a
n
o
Merge branc
h
'
j
n/perl-makemake
r
-
l
e
a
di
n
g-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merg
e
b
r
anch 'rj/platfo
r
m-pread-may-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e branch 'mm
/
co
n
fig-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Fourth batch
f
or 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branch
'
nd/cl
o
ne-single
-
fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branch 'th/
d
if
f
-no-index
-
fixes
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
amano
M
erge
b
ranch 'hv/re
m
ot
e
-en
d
-hung
-
up'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Haman
o
sha1_nam
e
.
c
: te
a
ch get_short
_
sha
1
() a commit-only option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hama
n
o
sha1_name
.
c: allow get_sho
r
t_sha1()
to t
a
k
e other fl
a
gs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ham
a
no
get_sha1(): fix error statu
s
regression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sh
a
1_name
.
c: restr
u
cture disamb
i
g
u
atio
n
of short name
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C Ha
m
ano
sha
1
_n
a
me
.
c
:
corr
e
ct mis
n
amed "canonical" and "res"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next