repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://github.com/git-l10n/git-po
2012-07-09
Junio C Hamano
rev-parse --disambiguate=<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C Hamano
r
e
v-
p
arse: A and B in "rev-parse A
.
.
B" refer to committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
reset: the command
t
a
kes co
m
mittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
c
ommit-tree: the co
m
mand wants
a tr
e
e an
d
co
m
mits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Ha
m
ano
apply: -
-
bu
i
ld-fake-ancestor expec
t
s
bl
o
bs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sh
a
1_name
.
c
: add suppor
t
for
disambi
g
uating o
t
her types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
a
m
an
o
revision
.
c: the "log" fami
l
y, except f
o
r
"
sh
o
w", ta
k
es
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
mano
revision
.
c
:
allow h
a
ndle_revision_
a
rg() to take other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c
: introduce
get_sha1_
c
omm
i
ttish()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sha1_name
.
c: teac
h
lookup context
t
o
g
et_sha1_with_context()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
sha1_name
.
c: m
a
ny
s
hort na
m
es ca
n
only be commi
t
tish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
sha
1
_
n
a
m
e
.
c
:
get_sha1_1() take
s
lookup
flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
sha1_name
.
c: get_des
c
ribe_name() by definition gr
o
ks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Haman
o
rerere: make
r
r-cache fanout
d
irectory honor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: document --3way o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: allow rerere
(
) to work
on --3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: regi
s
ter confli
c
te
d
stages t
o
the i
n
d
ex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
apply
:
--3way wi
t
h add/ad
d
conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
l
y: move v
e
rify
_
index_match(
)
h
igher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio 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
J
u
n
i
o
C Hamano
apply
:
fall b
a
ck
on three-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: accept
-
3/--3way command lin
e
opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hama
n
o
apply: move "al
r
eady exists" logic to check_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: mov
e
check_to_create_blob(
)
closer
t
o it
s
sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: f
u
r
ther split load_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: refactor "prev
i
ou
s
pa
t
ch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
a
p
ply: split load_pr
e
image
(
) helper fu
n
c
t
io
n
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: fac
t
o
r out
checkout_target
(
) helper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: refac
t
or read_file_or
_
gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: clear_image() cle
a
rs things
a b
i
t m
o
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
aman
o
a
pply: a bit more comments on PATH
_
TO
_
BE_DEL
E
TED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
ama
n
o
app
l
y: fix an incomplete co
m
ment in check_pa
t
ch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Alex Ri
e
s
e
n
Restore uma
s
ks influence
on
the
p
erm
i
ss
i
o
n
s of work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Chris Webb
Allow edit of
e
mpty message with commit --ame
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge git
:
/
/
github
.
co
m
/
g
i
t-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Fifth batch for 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
M
e
rge branch
'
cw/h
e
lp-over
-
network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Me
r
ge
branch 'mz/
e
m
p
ty-reb
a
se-tes
t
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge br
a
nch 'pw/git-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Me
r
ge branch 'j
s
/fa
s
t-export
-
path
s
-with-spaces
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'cw/no-det
a
ching
-
an-u
n
born
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Merg
e
branch 'vr/use-ou
r
-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
Merge branc
h
'mm/credentia
l
-plu
m
bing'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
Merge br
a
nch 'jc
/
ma
i
nt-bl
a
me
-
unique-a
b
brev'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C H
a
mano
Merge bra
n
ch
'
jn/p
e
rl-makemaker-l
e
ading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merge br
a
n
c
h 'rj/pla
t
form
-
p
re
a
d
-may-be-threa
d
-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch
'
mm
/
config-xdg'
commit
|
commitdiff
|
tree
2012-07-09
Jo
n
athan
Nie
d
e
r
M
ake
f
i
le:
d
oc
u
ment ground rul
e
s for target-s
p
e
c
ifi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makef
i
le: move GIT-VERSION-FILE depen
d
encie
s
closer
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
eff King
Makefile: bu
i
ld inst
a
web similar to oth
e
r sc
r
ip
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
e
ff King
Makefi
l
e: upda
t
e
scripts wh
e
n b
u
ild
-
time parameters
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Je
f
f King
Makef
i
le
:
do no
t
rep
l
ace @@G
I
T_VERSION
@
@ in shel
l
scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Ma
k
e
f
ile: spl
i
t prefix flag
s
from GIT-CFLAGS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nieder
Mak
e
file: be
s
ilent w
h
en onl
y
GIT_USER_AGENT
ch
a
nges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: s
p
lit GIT_USER_A
G
ENT from GIT-CFLAGS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jef
f
King
M
a
kefile: do not repl
a
ce @@GIT_U
S
E
R
_
AGENT@@ in sc
r
i
p
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
M
ake
f
ile: apply depen
d
en
c
ies cons
i
stently t
o
sp
a
rs
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Mak
e
file:
do
n
ot have git
.
o d
e
p
e
n
d
on common-cmds
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jon
a
than Nied
e
r
Mak
e
file: fol
d
XDIFF
_
H and V
C
SSVN_H
into LIB_H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Torste
n
Bögershausen
git on M
a
c
O
S and precomposed un
i
code
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Th
o
mas Gummerer
Replace strlen() with ce_namelen()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Matth
i
eu Moy
git-remote-mediawiki:
u
p
date comments to reflect creden
t
i
a
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
M
atthieu Mo
y
git-
r
emote-mediawiki: be mor
e
defensive when requests
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Ma
t
thieu Moy
git-remote-med
i
a
wik
i
: more effic
i
ent 'pull' in t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-mediawiki: extract revision-impor
t
ing loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Ma
t
thieu Moy
git-remote-mediawiki: refactor loop
o
ver revision id
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthi
e
u Moy
git-re
m
ote-med
i
awiki:
c
hange retu
r
n type of get_mw_pages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
NGUY
E
N Kim T
h
u
a
t
git
-
r
emo
t
e-mediawiki (t9363): test 'File:'
i
mport
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu
M
oy
g
it-remote-mediawiki: suppo
r
t fo
r
u
ploading file in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
S
imon Ca
t
h
e
b
r
as
git-remote-mediawiki (
t
9
3
6
2): tes
t
git-remote-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
git
-
r
e
mote-media
w
iki (t
9
361): test git-remote-media
w
iki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume S
a
s
d
y
git-re
m
o
t
e-mediawiki
(t9360): test git-remote-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Gu
i
llaume Sasd
y
git-remot
e
-
m
ediawiki
:
test
environment of git
-
remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaum
e
Sasdy
git
-
remote-med
i
awiki: s
c
ripts t
o
insta
l
l,
d
elete a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Max Horn
Make <re
f
name>
documentat
i
o
n more con
s
istent
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Gary Gi
b
bon
s
git p4: refactor diffOpt
s
calcu
l
at
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Pet
e
Wyckoff
git p4: notice Jobs lines
in git commit message
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyckof
f
git p4
t
est: refacto
r
ma
r
s
hal
_
dump
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyc
k
off
git p4: remove unused P4Submit interactiv
e
setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Mi
c
hael J Grube
r
t
3
404: make test 57 work wi
t
h dash and others
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
N
a
mhy
u
ng
Kim
gitweb
:
A
d
d
sup
p
o
rt to Link: tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
N
a
mhyung Kim
gitweb:
Handle
o
ther t
y
pes of tag in git_pr
i
n
t
_log
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
N
a
m
h
yu
n
g
K
i
m
gitwe
b
: C
l
eanup
git_print
_
l
o
g
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Matt
h
ieu Moy
git-r
e
mote-m
e
diawiki: imp
r
ove support
for non-Englis
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Fourt
h
b
atch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
J
unio
C
Ha
m
ano
Merge branch 'nd/
c
lone-single-fix'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C Hamano
Merg
e
bra
n
ch 'th/diff-no-
i
ndex-fixes
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branch 'h
v
/rem
o
te-end-h
u
n
g
-up'
commit
|
commitdiff
|
tree
2012-07-03
Jeff King
p
u
sh: don't guess at q
u
alifying rem
o
te refs on deletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Andr
e
as Schwab
Fix formatting in git-config
(
1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c:
t
e
ach get
_
short_sha1() a commit-
o
n
l
y option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
u
nio C Hamano
sha1_name
.
c: allo
w
g
e
t_s
h
ort_sha1() to
take other
fl
a
gs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ham
a
no
g
e
t_s
h
a
1
(): fix err
o
r
s
t
atus re
g
r
e
ssion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
u
nio C Hamano
sha1_name
.
c: restructure disambig
u
ation o
f
sho
r
t names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
u
nio C
H
amano
sha1_name
.
c: correct misnamed "cano
n
ical
"
and "
r
es"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
unio
C
Hamano
sha1
_
name
.
c:
r
efac
t
or f
i
nd
_
short_pac
k
ed_
o
bject()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
u
n
io C Ham
a
no
s
h
a1_name
.
c
: renam
e
"now" to
"
current"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C H
a
mano
sha1_n
a
me
.
c: clarify what "
f
ake" is f
o
r in find_sho
r
t_ob
j
ect
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha
1
_
nam
e
.
c:
g
et rid of
get_sha1_with_mode()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C H
a
mano
sha1_name
.
c
:
get
r
i
d of ge
t
_sha1_wi
t
h_mode_1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next