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
Merge branch 'mm/config-xdg'
2012-07-22
Junio C Hamano
Merge
b
r
a
nch
'
mm/c
o
nfig-xdg'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Me
r
ge branc
h
'
a
s/t4012-styl
e
-up
d
ates'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
M
erge branch 'pg/mai
n
t-1
.
7
.
9
-am-whe
r
e-is-patch'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Haman
o
Merge bra
n
ch 'jl/ma
i
nt-1
.
7
.
10-recurs
e
-submo
d
ules-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
ano
Me
r
ge branch 'ms/d
a
emon-
d
o
c
-typo'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Mer
g
e branc
h
'lk/
m
ore-hel
p
f
ul-status-h
i
nts'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hama
n
o
M
e
rge branch
'
j
c/sha1-name-more'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
a
mano
Me
r
ge branch 'jc/maint
-
filter-bran
c
h-e
p
och-da
t
e'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hamano
Update d
r
aft re
l
ease notes for 7th batch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
M
erge branch '
t
g/maint-cac
h
e
-name-compare
'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C
H
amano
Mer
g
e
branch 'jk/index-pac
k
-
s
treaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'jk
/
mai
n
t
-
comm
i
t-a
m
end-only-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Ha
m
ano
Merge branc
h
'cw/
a
mend
-
commit-
w
ithout-me
s
s
age'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge b
r
anch 'jn/makefile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Merge bran
c
h
'
ar/clone-
h
o
nor-umask-
a
t-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Ham
a
no
Merge
b
ranch 'jc/a
p
p
l
y-3w
a
y'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C H
a
mano
Mer
g
e branch 'cw
/
rebas
e
-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Haman
o
Merge branch 'p
w
/gi
t
-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
J
unio
C
H
a
m
a
n
o
Merge b
r
anch
'pw/git-p
4
-job
s
'
commit
|
commitdiff
|
tree
2012-07-14
Juni
o
C Hamano
Mer
g
e bran
c
h 'jk/push-d
e
lete-ref-error-m
e
ssage'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Haman
o
S
i
x
th
b
atc
h
for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio
C
Hamano
Merge branch 'jc
/
refactor-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
r
g
e br
a
nch 'tg/ce-na
m
elen'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hama
n
o
Merge branch 't
b
/sanitize-d
e
compos
e
d-utf-8-
p
athname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merg
e
branch 'm
m
/mediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Ham
a
no
M
e
rge
b
r
an
c
h '
j
n/vc
s
-svn
'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
M
erge bra
n
ch 'm
m
/mediawiki-f
i
le
-
attach
m
ents'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
Merg
e
b
ra
n
ch 'tr/ma
i
nt-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
Merge bran
c
h 'mz/r
e
base-no
-
mbox'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
t1512: match the "ot
h
e
r
" object names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Ham
a
no
t7003: add test to fi
l
ter a bra
n
ch with a commit at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Haman
o
da
t
e
.
c: Fix of
f
by one er
r
or in object-header d
a
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
t1512: ign
o
re
w
h
i
t
e
spaces in wc -l output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Haman
o
Reduce draft release
n
ot
e
s
t
o 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hama
n
o
Sync w
i
th 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Git 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
H
aman
o
Merge bra
n
c
h
'jc/m
a
i
nt-bla
m
e-unique-abbrev'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge
b
r
anc
h
'rj/platform-pread-may-be-t
h
read-unsaf
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
am
a
no
Merge br
a
nch 'th
/
diff-n
o
-
i
ndex-fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge br
a
nch 'nd/clone
-
si
n
gle-fix' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Haman
o
Merge branch 'jc/rev-l
i
s
t-s
i
m
plif
y
-merge
s
-fir
s
t-paren
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge
branch '
h
v
/submodule-update-nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
M
e
rge
branc
h
'
j
k/diff-no-
i
ndex-
p
ager' into main
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C
Hamano
Merge bra
n
c
h 'm
m
/
ver
i
f
y
-
f
ilename-fix' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
g
e
br
a
nch '
c
n/cherr
y
-pick-ra
n
ge
-
docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch 'jc/u
s
tar-chec
k
sum-is-unsigned' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge
b
ranch 'jc/bundl
e
-
complete-notic
e
'
i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge
b
ranch 'jc/
l
s-files-i-dir'
i
nto
main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branc
h
'jc/request-pull
-
ma
t
ch-
t
agname' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
cache_name_compare
(
):
do not tr
u
nc
a
te whil
e
comp
a
ring
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
H
amano
apply:
t
est
s
for the -
-
3wa
y
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Ham
a
no
fil
t
er-branch: do no
t
fo
r
get the '@' prefix
t
o force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
rev-par
s
e
-
-disambiguat
e
=
<prefix>
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-parse A
.
.
B" refer to com
m
itti
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
r
e
s
et: the command
t
a
kes com
m
ittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
c
ommit
-
tr
e
e: the command wants a
tree and
comm
i
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: --b
u
ild-fake-a
n
cest
o
r expects blobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
a
mano
sh
a
1_name
.
c: add support fo
r
disam
b
iguating other
ty
p
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
r
evision
.
c: the "log" f
a
mily, except for "sho
w
",
takes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
a
mano
revision
.
c: allow handle_revis
i
on_arg() to take
o
ther
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
sha
1
_name
.
c: introduce
g
et_sha1_committish()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
mano
sha1_na
m
e
.
c
:
te
a
ch lo
o
kup context
t
o get_sha1_with_co
n
text()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Hamano
sha1_n
a
me
.
c
:
many s
h
ort names ca
n
o
n
ly be
committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
s
h
a
1
_
n
ame
.
c:
g
e
t
_sha1_1(
)
t
akes l
o
okup flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
sha1_name
.
c: get_
d
e
s
c
r
i
be_name() b
y
d
efin
i
t
i
on gro
k
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
rerere: make rr-ca
c
he fanout directory honor u
m
ask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply
:
document -
-
3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply:
a
llow rerere
(
) to
work on --3way result
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C H
a
m
a
n
o
ap
p
ly: register conflicted stages to th
e
index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: -
-
3way with add/add conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
apply: move v
e
rify_index
_
match()
h
i
ghe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
plug the thr
e
e-way m
e
rge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
a
p
ply: fa
l
l back on
t
hree-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
apply:
a
ccept -3/--3way c
o
mmand line
o
pt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
apply: move "alr
e
ady exists" logic to c
h
e
c
k
_
to_creat
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply:
m
ove check_to_create_blob() closer to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: further
split load_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: refactor "previous patch"
logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: split
l
oad_preimage(
)
h
elper fu
n
ction out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
ppl
y
: f
a
ctor
o
ut chec
k
out_
t
arget() hel
p
er func
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
no
apply:
refacto
r
read_file_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
appl
y
: clear_im
a
ge() clears th
i
ngs a b
i
t 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_BE_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hamano
a
pply
:
fix an incomplete comment in ch
e
ck_patch
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
Merge git://gith
u
b
.
com/git-l10n/gi
t
-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
F
i
fth b
a
tch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
Merg
e
b
ran
c
h 'cw/help-ov
e
r-network'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
mano
Merge branch 'mz/empty-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
ano
Mer
g
e
branch 'pw/git-
p
4-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
Merge branch 'js/fast-e
x
port-path
s
-
w
it
h
-s
p
ac
e
s'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
mano
Merge branch
'
cw/n
o
-deta
c
hing-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C H
a
mano
M
erg
e
branch 'vr/use-
o
ur-per
l
-
i
n-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merge branch 'mm/cred
e
n
tial-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
n
o
Merge branch 'jc/
m
aint-blame-uniqu
e
-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hama
n
o
M
erge branch '
j
n
/
p
er
l
-ma
k
emaker-leading-paths'
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Ha
m
ano
Merge branch
'rj
/
platform-pread-ma
y
-be-
t
hread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Haman
o
Merge branch
'
m
m/con
f
ig-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
Hamano
Fourth batc
h
for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
M
e
r
g
e br
a
n
ch
'
nd/clone-s
i
n
gle-fix
'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
io C Hamano
M
erg
e
branch
'
th/diff-no-index-fixe
s
'
commit
|
commitdiff
|
tree
next