repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.7.12-rc2
2012-07-16
Junio C Hamano
M
e
rge branc
h
'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Ham
a
no
M
e
rge branch 'pw/git-p4-job
s
'
commit
|
commitdiff
|
tree
2012-07-14
Junio C
Hamano
Me
r
ge branch '
j
k/push-delet
e
-ref-err
o
r
-
messa
g
e'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Si
x
th bat
c
h for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
Merge branc
h
'jc/refactor-
d
iff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge b
r
anch 'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merg
e
b
r
anch
'tb/sa
n
itize-decomposed-
u
tf-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
Merge
b
r
anch 'jn/v
c
s-svn'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C
H
a
mano
M
e
r
g
e branch 'mm/med
i
awiki-f
i
le-attachments
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'tr/maint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
Mer
g
e
b
ranch 'mz/re
b
a
se-no-mbox
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Haman
o
t151
2
:
m
at
c
h the "o
t
her" o
b
ject na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Ham
a
no
t7003:
add t
e
st t
o
f
ilter a branch wi
t
h a
c
ommit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
date
.
c: Fix off b
y
one err
o
r in object-header date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
t1
5
1
2
:
ignore whitespaces in wc -l output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o C Hamano
Reduce draft
release not
e
s to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Sync wit
h
1
.
7
.
11
.
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
Me
r
ge branch 'jc/maint-b
l
ame-unique-abb
r
ev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
M
e
rge branch '
r
j/platf
o
rm
-
pread-may-be
-
th
r
ea
d
-
unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge bra
n
ch 'th/di
f
f-no-index-
f
ixes' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Hamano
Merge branch
'nd/clon
e
-single-fix'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bran
c
h 'jc/rev-list-sim
p
lify-merg
e
s-first-
p
arent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Haman
o
Merge branch 'hv/submodule-upda
t
e-nuke-su
b
modules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
amano
Merge bran
c
h 'jk/d
i
f
f-no-index-pager' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge bran
c
h 'mm/verify-fi
l
e
name-
f
ix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merg
e
branch 'cn/che
r
ry-pick-rang
e
-
d
ocs' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
H
amano
M
erge branch 'jc/ustar
-
check
s
um
-
is-unsig
n
ed' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Ham
a
no
Merge bra
n
ch 'jc/bundl
e
-com
p
le
t
e-notice' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge bran
c
h
'jc/ls
-
f
i
les-i-dir' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bran
c
h 'j
c
/request-pul
l
-m
a
tch-t
a
gname
'
i
n
to main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bran
c
h
'
tg/ma
i
n
t-cache-name
-
compa
r
e' into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Ham
a
n
o
cache_name_compare(): do not truncate w
h
ile compa
r
in
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Ju
n
io C Hamano
apply: tests for
t
h
e -
-
3way opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Ju
n
io
C
Hamano
filter-bra
n
c
h
:
do n
o
t forget
t
he '@' p
r
efix to f
o
rce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
am
a
no
rev-parse --disambiguate=<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
r
e
v-parse: A and
B
in
"rev-pars
e
A
.
.
B" refer to committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
reset: the
c
omm
a
nd takes comm
i
ttish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
commit
-
t
ree: the command
w
a
n
t
s
a tree and commit
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
app
l
y: --build-fake-
a
n
c
estor expects bl
o
b
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
sha1_name
.
c: add
support for d
i
sambig
u
ating other
t
y
p
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
mano
revision
.
c: the "log" family, exc
e
pt fo
r
"sho
w
"
, takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
revis
i
o
n
.
c: all
o
w h
a
ndle_revision_arg() to take other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
sha1
_
name
.
c: i
n
troduc
e
get_sha1_com
m
ittish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
sha1_name
.
c: teach look
u
p context
to g
e
t
_sha1_with_conte
x
t
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c
: many s
h
or
t
names can on
l
y be
c
ommit
t
ish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sh
a
1_na
m
e
.
c: get_sha1
_
1() takes lookup flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Haman
o
sha1
_
name
.
c: get_describe_name() by de
f
ini
t
ion
g
r
oks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
re
r
e
re: m
a
ke rr-cache fanout directory honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
document -
-
3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
ap
p
ly: allow rerere()
to work
on --3way
results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
app
l
y
:
register conflic
t
ed
stage
s
to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: -
-
3way with add/
a
dd conflic
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
appl
y
:
m
ove verify_i
n
dex_match() hig
h
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply:
p
lu
g
the three-way mer
g
e l
o
g
ic
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fa
l
l back
o
n three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: accept -3
/
--3way c
o
mmand line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move "already e
x
ists" logic to chec
k
_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
a
p
pl
y
: m
o
ve c
h
e
c
k_to
_
create_blob() c
l
oser t
o
i
ts
sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: further spl
i
t load_preim
a
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hama
n
o
app
l
y: refact
o
r "previou
s
patch
"
l
ogic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: spli
t
load_pr
e
image() helper
function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: factor out checkout_t
a
rget() helpe
r
func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: refactor read_fil
e
_or
_
gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: cl
e
ar_image() clears
thing
s
a
bit mor
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Hama
n
o
apply: a bit more c
o
mments o
n
P
A
T
H_T
O
_BE_DELET
E
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Ha
m
ano
a
p
ply: fix an incomplete comment in
check_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
Merge
git://github
.
com/git-l10n/
g
it-po
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C H
a
mano
Fifth b
a
tch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Me
r
ge
branc
h
'cw/hel
p
-over-network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
M
erge branch 'mz/emp
t
y-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
Merge branch 'pw/git-p4-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
M
erge
branch 'js/fast-ex
p
ort
-
p
a
t
hs-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge b
r
anch
'
cw
/
no-detachi
n
g-a
n
-unbo
r
n'
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
Mer
g
e branch 'v
r
/use-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'mm/credential-plumbin
g
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
Merge
branch 'jc/
m
aint-blame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge branch
'jn/perl-makemaker-
l
eading-path
s
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge branch 'r
j
/plat
f
orm-pread-may-be-thr
e
ad-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
b
ranch 'mm/co
n
fig-x
d
g'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Four
t
h batch f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
io
C H
a
m
a
no
Merge branch 'nd/clone-sing
l
e-
f
i
x
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge
branch '
t
h/di
f
f
-no-index-fixes
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ham
a
n
o
Merge branch 'h
v
/re
m
ot
e
-
end-hung-up'
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o
C Hamano
sha1_nam
e
.
c:
t
each get_sho
r
t_sha1() a co
m
m
it
-
only option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
s
ha1
_
n
a
me
.
c: allow get_short_sha1()
to take othe
r
flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hamano
get_
s
ha1(): fix error sta
t
us
regression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_
n
ame
.
c: restructure disamb
i
guatio
n
of sh
o
rt names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
Hamano
sha1_na
m
e
.
c: correct misna
m
ed "canon
i
cal"
a
n
d
"res"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C Hama
n
o
sha1
_
name
.
c: refactor find_short_p
a
c
k
ed_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
Hamano
sha1_
n
ame
.
c: r
e
name "now" to
"
current"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
uni
o
C
Ham
a
no
sha1_name
.
c: clarify what "fake" is for
i
n find_sh
o
r
t
_object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C H
a
mano
sha
1
_name
.
c:
g
et rid of g
e
t_sha1
_
with_mode
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
io C
H
ama
n
o
sha1_
n
ame
.
c: get r
i
d of get
_
sha1_with_
m
o
d
e_1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
Sy
n
c with i1
8
n
-p
o
upd
a
te
s
in ma
i
nt
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio
C
Hamano
Mer
g
e bra
n
c
h
'
m
aint' of gi
t
://
g
i
thub
.
c
o
m/git
-
l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Ha
m
a
no
s
h
a1_nam
e
.
c
:
hide get_sha1_with
_
cont
e
xt
_
1
(
) ugliness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Haman
o
bla
m
e: comput
e
ab
b
revia
t
i
o
n width that ensu
r
e
s
uniqueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Ha
m
a
no
diff
-
index
.
c:
"
git diff" has no
need
t
o read blob
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next