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 'jk/mediawiki-credential'
2012-07-24
Jun
i
o C Haman
o
Merge bra
n
ch 'jk/me
d
i
a
wiki
-
cr
e
dentia
l
'
commit
|
commitdiff
|
tree
2012-07-24
J
uni
o
C Hamano
Merge branch 'mm/mediawiki-usability'
commit
|
commitdiff
|
tree
2012-07-24
Junio C Hama
n
o
Merge
b
ranch 'sn/doc-typofi
x
'
commit
|
commitdiff
|
tree
2012-07-24
Junio C Hamano
Merg
e
br
a
nch
'tg/ce-name
l
e
n-f
i
eld'
commit
|
commitdiff
|
tree
2012-07-24
J
un
i
o C Hamano
Me
r
ge branch 'nk
/
mai
n
t-
g
itweb-lo
g
-
b
y
-l
i
nes'
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
mano
Updat
e
draft releas
e
notes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-22
J
u
n
io C Haman
o
Sync with 1
.
7
.
11
.
3
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Git 1
.
7
.
11
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
ano
Me
r
ge b
r
anch 'jk/push-delete-ref-error-
m
es
s
a
ge' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hama
n
o
Me
r
ge branch 'ar
/
clone-honor-umask-at-top' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
ama
n
o
Merge bra
n
ch 'c
w
/amend-c
o
mmi
t
-
without-m
e
ssage' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
amano
Merge branch 'jk/maint-com
m
it-amend-only-no
-
path
s
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hamano
M
e
rge branch 'tg/m
a
int-cache-name-co
m
p
a
re' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hama
n
o
Merge
b
ranch
'
tr/main
t
-sho
w
-wa
l
k
'
into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Me
r
ge branch 'jc/refac
t
or-dif
f
-
stdin'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o
C
Hamano
Merge b
r
a
nch 'mz/empty-rebas
e
-test' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hamano
Merge br
a
nch 'js/fast-
e
xpo
r
t-
p
aths-wi
t
h-spaces
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Haman
o
Me
r
ge branch '
c
w/no-detaching-an-unborn' into m
a
int
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
aman
o
Merge branch
'vr/use-our-perl-in-tes
t
s' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge gi
t
:
/
/bogomips
.
org/gi
t
-svn
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Ha
m
a
no
M
erge bra
n
c
h
'j
k
/revi
s
ion-
w
alk-stop-at-max-co
u
nt'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hamano
Merge b
r
anch 'mm/config-
x
dg'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Merge bran
c
h 'a
s
/
t
4
012
-
style-updates
'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ham
a
no
Mer
g
e branch 'pg/maint
-
1
.
7
.
9-am
-
where-is-
p
a
tch'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hama
n
o
M
erge branch 'jl/maint-1
.
7
.
1
0
-recur
s
e
-
s
u
b
m
odules
-
wit
h
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hama
n
o
Me
r
g
e branch 'ms/d
a
e
m
on
-
doc-typo'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Me
r
g
e branch 'lk/mo
r
e-hel
p
ful-status-hints'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C
Hama
n
o
Merge
b
ranch 'jc
/
s
h
a1-name-more
'
commit
|
commitdiff
|
tree
2012-07-22
J
un
i
o
C Haman
o
Merge
b
ranch 'jc/maint-fi
l
ter-branch
-
ep
o
c
h
-
dat
e
'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Update draft r
e
lease notes for 7
t
h batch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
a
m
a
n
o
M
e
r
g
e branch 'tg/maint-ca
c
he-name-com
p
are'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Me
r
ge branch 'jk/index-pack-streaming-f
i
x'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
Merg
e
branch 'jk/
m
aint-commit
-
amend
-
only
-
no-paths'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
M
erg
e
branc
h
'cw/amend-comm
i
t-without-mes
s
ag
e
'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
Merge b
r
anch 'jn/ma
k
efile-cleanup
'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
H
amano
Merge b
r
anc
h
'ar/cl
o
ne-h
o
nor-umask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hamano
Merge
b
ra
n
ch 'jc
/
apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Mer
g
e branch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Merge bran
c
h 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o
C Haman
o
Merge branch 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C
Hamano
M
erge br
a
nch 'jk/push-delete-ref
-
er
r
or-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Sixth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Ham
a
no
Me
r
ge
b
ranch 'jc/re
f
actor
-
diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Ham
a
no
Merge branc
h
'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
Merg
e
branch 'tb/sanit
i
ze
-
deco
m
posed-
u
tf-8-pat
h
name'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
H
a
mano
Merge br
a
nch 'mm/mediawiki-tests
'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Ha
m
a
n
o
Merge branch 'jn/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Ha
m
a
n
o
Me
r
ge branch 'mm/
m
ed
i
awi
k
i-file-attach
m
ents'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'tr/maint-s
h
ow
-
walk'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
Merge branch 'mz
/
rebas
e
-
n
o-mbox'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
t1512: match the "other" object
n
ames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
t7
0
03: add tes
t
to filter a branch with a comm
i
t at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Ha
m
a
n
o
date
.
c: Fix off b
y
one er
r
or in objec
t
-header da
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
m
a
no
t1
5
12
:
ign
o
re whitespaces i
n
wc -l outpu
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C
Ham
a
no
Reduce
d
raft release notes
t
o
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C Ha
m
ano
Sync with 1
.
7
.
1
1
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Git 1
.
7
.
1
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/
m
aint-
b
lame-unique-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Ham
a
n
o
M
e
rge branch
'
rj/pla
t
form-pread-may-be-thread-
u
n
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge b
r
anch 't
h
/diff-no-in
d
ex-fixes'
into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C Hamano
Mer
g
e
br
a
n
c
h 'nd/clone-single-fi
x
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branc
h
'j
c
/rev-list-s
i
mplify-merges-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge
b
ranch
'
hv/s
u
bmodule
-
update-nuke-subm
o
dules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge
b
ranch 'jk/diff-no-ind
e
x-pager' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge branch 'mm/verify-filename
-
fix' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
m
an
o
Me
r
g
e
branc
h
'cn/cher
r
y
-pick-ra
n
ge-docs' i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge
bra
n
c
h 'jc/ustar-
c
hecksum
-
is-unsigned' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/bu
n
dle-complete-notice'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge branch '
j
c/
l
s-files-i-di
r
' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
Me
r
ge branc
h
'jc/request-pull-matc
h
-tagname' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C H
a
mano
M
erge
b
r
anc
h
't
g
/ma
i
nt-cache-na
m
e-compare' into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
cache_name_compare(
)
:
do
n
ot
tru
n
cate while comparin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Ham
a
n
o
a
p
ply: tes
t
s for the --
3
way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jun
i
o C Hamano
filter-br
a
nch: do n
o
t forget the '@' prefi
x
to force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
r
e
v-pa
r
se
-
-disambi
g
u
a
te=<prefix
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-par
s
e: A and B
i
n "rev-parse A
.
.
B" refer to committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
H
am
a
no
reset: the comman
d
takes committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
c
o
m
mit-tree: the co
m
man
d
w
a
n
ts a tree and commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: --build-fake-ances
t
or e
x
pects blobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
sha1_name
.
c: add
s
up
p
ort
for di
s
a
m
biguating other types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
revision
.
c:
the "log" famil
y
, e
x
cept for "show", tak
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
revi
s
ion
.
c
:
allow
h
andle_revision_arg() t
o
tak
e
other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
no
sha1_name
.
c
:
introduce get_sha1_commi
t
tish
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
sha1_n
a
me
.
c: teach lookup context
t
o get_
s
h
a1_wit
h
_
c
ontext()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
sha1_name
.
c: many s
h
o
r
t
n
ames can only be com
m
ittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
sha1_name
.
c: g
e
t_
s
h
a1
_
1() takes lookup flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
man
o
sha1_name
.
c: get_describe_name() by definition groks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Haman
o
rerere:
make rr-cach
e
fanout directory hon
o
r umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
apply: document --3way o
p
tio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: allow rerere() t
o
work
o
n
--3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: register conflicted
stages to t
h
e index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply:
--3way with
a
dd/add
conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
a
pply: m
o
v
e
verify_index_match
(
)
higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
a
pply: plug
t
he
three-way merge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
apply: fall ba
c
k on th
r
ee-way
me
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
accep
t
-3/--3way command line
o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
appl
y
: move "alre
a
d
y exists"
l
ogic to
ch
e
ck_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
amano
apply: move check_to_create_blob()
c
loser to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
apply: further
s
plit load_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
app
l
y:
r
efa
c
t
or
"
previous
p
at
c
h" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next