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 branch 'jk/maint-commit-amend-only-no-paths'
2012-07-16
Junio C
Hamano
Me
r
g
e
b
ranch
'jk
/
ma
i
nt-c
o
m
mit-amen
d
-only-no-p
a
th
s
'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Haman
o
M
erg
e
branch 'cw/amend-commit-without-message'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
ano
Merge b
r
anch '
j
n/m
a
kefile-cl
e
a
nup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
branch 'a
r
/cl
o
ne
-
hon
o
r-uma
s
k
-
at-to
p
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Merge
branch
'
jc/apply-
3
wa
y
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
erge branch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
b
ra
n
ch 'pw/git-p4-move
'
commit
|
commitdiff
|
tree
2012-07-14
Ju
n
i
o
C Hamano
Merge
b
ranch '
p
w/
g
it-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Ha
m
a
no
Mer
g
e
b
r
a
nch
'j
k
/push-del
e
te
-
ref-e
r
r
or-me
s
sage'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Ham
a
no
Sixth
batch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
unio
C
H
amano
M
erge br
a
nc
h
'jc
/
refacto
r
-
diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
a
n
o
Merge bran
c
h
'
tg/c
e
-namele
n
'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C
H
ama
n
o
M
erg
e
bran
c
h 't
b
/sanitize-decomp
o
sed-utf-8-
p
athna
m
e'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hama
n
o
Me
r
g
e b
r
anch 'mm/mediawiki-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Ham
a
n
o
Merge branch 'jn/v
c
s-s
v
n'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Merg
e
bra
n
ch 'mm/mediawiki-fil
e
-attachments'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hama
n
o
Me
r
ge branch 'tr/mai
n
t-show-w
a
lk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
a
m
ano
M
e
rge branch 'mz/rebase-no
-
mbox'
commit
|
commitdiff
|
tree
2012-07-12
Gary Gi
b
bons
git p4: add support for
'
p
4 m
o
v
e
'
in P4Submi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hama
n
o
R
e
duce draft release notes
t
o
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
i
o C Haman
o
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
mano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/maint
-
blame-unique-abbrev' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge branch
'
r
j
/platform-p
r
ea
d
-may-be-
t
hr
e
ad-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
H
a
m
ano
Merg
e
branch 'th/diff
-
no-index-fix
e
s' i
n
to main
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
i
o
C Ha
m
ano
M
erge
b
ranch 'nd/clone-sin
g
l
e-
f
ix' int
o
m
aint
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o C Hamano
Merge branc
h
'jc/rev-li
s
t-si
m
plify-
m
erges-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e
b
ranch 'hv/s
u
bmodule
-
u
pdate-nuke-
s
ubmodul
e
s
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
M
erge branch 'jk
/
diff
-
no-
i
nd
e
x
-
p
a
g
er'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
Merge
branch '
m
m/ver
i
fy-file
n
a
me-fix' i
n
to
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e branch 'cn/che
r
ry-
p
ick-range-docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C Ha
m
ano
Merge branch 'jc
/
ustar-checksum-is-unsigned' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e
branch
'
jc/bundle-complete-notice' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hama
n
o
M
e
rge branc
h
'jc/
l
s-files-i
-
dir
'
into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
mano
Merge
b
ranch 'jc/request-pull-
m
a
t
ch-tagname' into maint
commit
|
commitdiff
|
tree
2012-07-10
Jeff
King
commit:
fix
"
-
-ame
n
d -
-
onl
y
" with no
pathspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
Hamano
a
p
ply:
t
e
sts
f
or the --3w
a
y
op
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff Ki
n
g
add: create ADD_EDIT
.
patch with
m
ode 0666
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
mano
r
e
rere:
m
ake r
r
-cac
h
e f
a
nout directory honor uma
s
k
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
Jun
i
o C Hamano
appl
y
: allow rerere() to work on --3way r
e
sults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: register con
f
licted stages to
t
he ind
e
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: --
3
w
a
y with add/
a
dd
c
onflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
apply: move
v
erify_index_match
(
) h
i
gher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
p
ply: plug
t
he three-way merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
ap
p
ly:
f
all
ba
c
k
on
three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
appl
y
: a
c
cept
-
3/-
-
3way command
li
n
e option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
a
m
ano
apply
:
move "already ex
i
sts" logic t
o
che
c
k_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply:
mov
e
check_to_cre
a
t
e
_blob() closer to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
mano
a
p
ply: furth
e
r split load_pre
i
mage(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refactor "previou
s
patch
"
lo
g
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: split l
o
ad_preimage() help
e
r
f
unc
t
ion
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
apply:
factor out ch
e
c
k
out_
t
arget() helper f
u
nction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C
Haman
o
a
p
ply
:
ref
a
ctor
read_file_or_gitl
i
n
k()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: clear
_
image(
)
c
l
ears
things a bit mo
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
a bit more
c
omments on P
A
TH_TO_BE_DELET
E
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: fix an
i
nc
o
m
p
l
e
t
e co
m
ment in c
h
eck_patc
h
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Al
e
x Riesen
Restor
e
umasks in
f
luence on t
h
e permissi
o
ns of
w
o
r
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Chris Webb
Allow
e
dit of
empty message with comm
i
t --a
m
end
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merge g
i
t://github
.
com/git-l10
n
/git-po
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
F
i
fth
b
atch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ha
m
ano
M
e
rg
e
b
r
an
c
h 'cw/help-over-n
e
twork'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge branch 'mz/empty-reba
s
e-test
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Merge branch 'pw/git
-
p4
-
tests'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merge branch 'j
s
/
fast-e
x
p
ort
-
paths-with-
s
p
a
ces'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Mer
g
e
branch
'cw/no-d
e
taching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Haman
o
Merge branch 'vr/u
s
e-o
u
r-pe
r
l-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
M
e
r
g
e bra
n
ch 'mm/credential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge bran
c
h
'jc/maint
-
blame-u
n
iq
u
e-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rge
branch 'jn/pe
r
l-makemaker-leadi
n
g-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge b
r
anch '
r
j/plat
f
orm-pr
e
ad-may
-
be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
Merge branch 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-09
Jo
n
athan Nieder
Makefile: document ground rules for target
-
s
p
ecif
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Je
f
f King
Makefile: move
G
I
T-VERSI
O
N-FILE
d
ependencies c
l
oser
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Ki
n
g
Mak
e
file: b
u
i
ld instaweb simi
l
ar to other scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Ki
n
g
Mak
e
file
:
upda
t
e s
c
r
i
pts
w
hen
b
uild-time parameters
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Mak
e
f
i
le:
d
o
n
o
t repl
a
ce @
@
GIT_VER
S
ION@@ in shel
l
scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Je
f
f King
Mak
e
fi
l
e:
s
plit pr
e
fix flags from GI
T
-CF
L
AGS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonath
a
n Niede
r
Makefile:
b
e
s
i
l
ent when only G
I
T_USER
_
AGENT changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: split GIT_U
S
E
R_
A
GEN
T
from GIT-CFLAGS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jef
f
Kin
g
M
a
kefi
l
e
: do not replace @@GIT_USER_AGENT@@ in script
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefil
e
: apply depe
n
den
c
i
e
s consistently to spar
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jef
f
King
M
a
ke
f
i
l
e
: do not have gi
t
.
o depend on co
m
mo
n
-cmds
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nieder
M
akefi
l
e
:
fold XDIFF_H and
VCSSVN
_
H into LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Torst
e
n
Bögershausen
git on Mac
O
S and prec
o
m
p
ose
d
unicode
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Thomas
G
ummerer
Replace strlen() wit
h
c
e_namelen()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
M
a
tthieu Mo
y
git-remote-mediawiki: update comments
t
o reflect credent
i
al
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matt
h
ie
u
Moy
git-
r
e
m
ote-medi
a
wiki:
be more defe
n
s
i
v
e whe
n
requests
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Mat
t
hieu Moy
git-remote-
m
e
diaw
i
ki: mor
e
eff
i
cie
n
t 'pull
'
in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu
M
oy
git-remo
t
e-medi
a
wiki:
extract revision-imp
o
rting
l
oop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Mat
t
h
i
eu Moy
g
i
t-remo
t
e-m
e
diawiki: ref
a
ctor loop ove
r
revisio
n
id
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
g
i
t-remote-m
e
diawiki
:
change return type of get_mw_pa
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
NGUYEN Kim
Th
u
at
git-remote-media
w
ik
i
(t9363): test 'F
i
le:'
i
mpor
t
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthi
e
u Moy
git-rem
o
te-me
d
iawiki: sup
p
o
r
t for u
p
l
o
a
d
ing fi
l
e
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Simo
n
Cathebras
git-remote-mediawiki (t9362):
test git-re
m
ote-medi
a
wiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
G
u
i
ll
a
ume
S
a
sdy
git-remot
e
-m
e
diawiki (t93
6
1): test git-remote-
m
ediawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guilla
u
m
e
Sas
d
y
gi
t
-
r
e
m
o
t
e-m
e
dia
w
iki (t
9
360
)
: test git-r
e
mo
t
e-me
d
iawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
G
u
illaume Sa
s
dy
git-remote-m
e
diawiki: test environmen
t
of git-remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sas
d
y
git-remo
t
e-
m
ediawiki: sc
r
ipts to insta
l
l, dele
t
e
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Gary Gibbons
git p4: refa
c
tor diffOpts calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next