repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'da/p4merge-mktemp-fix'
2013-02-04
Junio C
H
a
m
ano
Merge
b
ranch 'jc/he
l
p'
i
nt
o
maint
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Merge bra
n
ch 'jc/merge-blobs' into maint
commit
|
commitdiff
|
tree
2013-02-04
Junio C Ham
a
no
M
e
rge
branch 'jc/
d
o
c
-m
a
intainer' int
o
maint
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Merg
e
b
r
anc
h
'bc/fix-array-
s
yntax-for-3
.
0-
i
n-completion
.
.
.
commit
|
commitdiff
|
tree
2013-02-04
Marc Khouzam
c
ompletion
:
ha
n
dle p
a
t
h
c
ompletio
n
and colon for tcsh
.
.
.
commit
|
commitdiff
|
tree
2013-02-03
John
Keepin
g
b
u
iltin
/
apply: t
i
g
h
t
en (dis)similarity index
parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-03
Junio C Hamano
combine-diff: l
i
ft 32-way limit of combined diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d A
g
uila
r
doc: generate
a list of valid
m
erg
e
tool
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetoo
l
--lib: list user
conf
i
gured tools in '--tool
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d Agu
i
lar
me
r
getool--lib: add function
s
for finding a
v
ailab
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-03
Christoph J
.
Thompson
H
onor confi
g
u
r
e's
ht
m
ldir sw
i
tch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-02
Jo
n
athan Nied
e
r
M
a
k
efile: explicit
l
y set tar
g
e
t name
f
or a
u
togen
e
rated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-02
Sven Strickroth
mergetools: t
e
ach to
r
toise
m
erge to handle f
i
lenames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
John
Keeping
Re
n
ame
{
g
it- => git}r
e
mote-helpers
.
t
x
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Stephen Boy
d
run-command: be more i
n
formative about what
fai
l
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Thomas Ackerma
n
n
Do
c
umentation: S
t
Git is the righ
t
spelling, not StGIT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Jun
i
o
C
Ha
m
ano
Documentat
i
on: desc
r
ibe
t
he "repository" in repository
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Thomas Acke
r
mann
D
o
cumentation:
a
dd a descr
i
ption fo
r
'gi
t
file' to
g
lossary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Thomas Acker
m
ann
Document
a
tion:
d
o not use undef
i
ned
t
erms git-dir a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Tho
m
as Ackermann
Doc
u
mentation: the
n
ame of
t
he system
is 'Git',
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Thomas Acker
m
ann
Documentation
:
avoid poor-ma
n
'
s
small caps GIT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Ju
n
io C Haman
o
Update d
r
a
f
t
r
elease
notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Junio
C Hamano
Merge branch 'nd/ed
i
t
-b
r
a
n
ch-
d
esc
-
while
-
de
t
ached'
commit
|
commitdiff
|
tree
2013-02-01
Ju
n
i
o C Hamano
Merge branch
'jk/gc-auto-
a
fter-fetch'
commit
|
commitdiff
|
tree
2013-02-01
Junio
C Ham
a
no
Merge bra
n
ch 'b
c
/git-p4-for-pytho
n
-
2
.
4'
commit
|
commitdiff
|
tree
2013-02-01
J
u
nio C Hamano
Merge branch 'jn/do-not-drop-u
s
er
n
ame-when-reading
.
.
.
commit
|
commitdiff
|
tree
2013-02-01
Ju
n
io
C
Hamano
Merge br
a
n
ch 'jk/cvsimport
-
does-not-w
o
rk
-
with-cvsps3'
commit
|
commitdiff
|
tree
2013-02-01
Ju
n
io C Hamano
Me
r
ge
branch 'jc/do-not-let-r
a
ndom-file-inte
r
fere-wi
t
h
.
.
.
commit
|
commitdiff
|
tree
2013-02-01
Junio
C
Hamano
Merge branch '
a
s/
t
est-cleanup'
commit
|
commitdiff
|
tree
2013-02-01
J
u
n
io C Ha
m
ano
Merge bra
n
ch 'jc/no-git-config-
i
n-clone'
commit
|
commitdiff
|
tree
2013-02-01
Junio C
Hama
n
o
Merge branch 'nd/fetch
-
d
epth-is-brok
e
n'
commit
|
commitdiff
|
tree
2013-02-01
J
eff King
D
ocumentation/Makefile:
c
le
a
n up M
A
N*_
T
XT lis
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Junio C
Hama
n
o
a
pply: diagnose in
c
omplete submodule o
b
ject name better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Junio
C
Hamano
a
p
ply:
simp
l
i
f
y
build_f
a
ke_ancestor
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hamano
git-am: record ful
l
index line in the
patch
use
d
whil
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Jeff Ki
n
g
b
r
a
n
c
h
:
l
et branch filters imply
--lis
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
J
e
f
f
K
i
ng
d
o
cs: clarify git-
b
ranch --list
b
eha
v
ior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-31
Stephen Boyd
gpg: close stderr once fini
s
hed with it i
n
verify_signed_buf
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-31
Stephen Boyd
gpg:
a
llow t
r
a
n
slation of
m
ore error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-31
F
raser Tweeda
l
e
pu
s
h: fix segfault whe
n
H
E
AD points nowhere
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
J
unio
C Hama
n
o
Merge git://ozlab
s
.
org/~paulus/g
i
tk
commit
|
commitdiff
|
tree
2013-01-30
Joh
n
Kee
p
ing
C
o
dingGuidelines: add Python coding guidelines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Junio
C H
a
ma
n
o
g
it_r
e
m
ote_helpers: remove GIT-PYTHON-VERSION upon
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Juni
o
C Hamano
INST
A
LL:
gi
t
-p4 does
n
ot support
Python 3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Nguyễn Thái
Ngọc
Duy
branch: mar
k
more strings
f
or tr
a
nslation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Junio C Haman
o
Merge branc
h
'nd/edit
-
branch-desc-while-detached' into
.
.
.
commit
|
commitdiff
|
tree
2013-01-30
Nguyễn Thái Ngọc Duy
branch: give a more he
l
pful message
on red
u
ndant arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Nguyễn
T
hái Ngọc Duy
br
a
nch: re
j
ec
t
-D/-d
without branch n
a
m
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Nguyễn Th
á
i Ngọc Duy
branch: no detached HEAD chec
k
whe
n
edi
t
ing
a
nother
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hamano
Merge
b
r
a
nch 'rr/mi
n
imal
-
stat'
commit
|
commitdiff
|
tree
2013-01-30
Junio C
Hamano
Merge bran
c
h '
n
d/ma
g
ic-p
a
th
s
pec-from-root'
commit
|
commitdiff
|
tree
2013-01-30
Junio
C
H
amano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2013-01-30
Junio C H
a
ma
n
o
Merg
e
b
r
anch 'tb/t0050-maint' into maint
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mer
g
eto
o
l--lib: impr
o
ve the he
l
p
text
i
n
g
ue
s
s_merge_tool()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib: simpl
i
fy command expressions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
Junio
C
Hamano
Merge
branch 'nd/fix-direct
o
ry-att
r
s-o
f
f-by-
o
ne' into
.
.
.
commit
|
commitdiff
|
tree
2013-01-29
Junio
C H
a
mano
Merge branch 'ph
/
rebase-preserve-
a
l
l
-m
e
r
ges' into main
t
commit
|
commitdiff
|
tree
2013-01-29
Junio C H
a
mano
README
:
update stal
e
and/or incorrect in
f
ormation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
m
e
rgetools:
simpl
i
fy how we han
d
le "vim" a
n
d
"
defaul
t
s"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
Andrej E Baran
o
v
gitweb: refer to picon/grav
a
tar
i
mages ove
r
the same
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hama
n
o
U
p
date dr
a
ft rel
e
ase
n
otes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Sync with 1
.
8
.
1
.
2
commit
|
commitdiff
|
tree
2013-01-28
Jun
i
o C Hamano
Git 1
.
8
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
Juni
o
C Ham
a
no
Merge
branc
h
'
ss
/
help-htmlpat
h
-
c
onfig-d
o
c' into maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
M
e
rg
e
branch 'nd/att
r
-debug-fix' into m
a
i
n
t
commit
|
commitdiff
|
tree
2013-01-28
Junio
C
Hamano
Merge b
r
anch 'ds/complet
i
on-s
i
lence-in-tree-pat
h
-probe
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
J
u
ni
o
C Hamano
Merge
b
ranch
'jn/maint
-
trim-vim-c
o
ntrib' into main
t
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Me
r
ge bran
c
h 'pe/doc-email-env-is-trumped-by-
c
onfig
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ha
m
a
n
o
Merge branch 'mk/com
p
lete
-
tc
s
h'
into maint
commit
|
commitdiff
|
tree
2013-01-28
J
un
i
o C H
a
mano
Merge branch '
a
p/status-i
g
nored-in-ignored-directory
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Jun
i
o
C H
a
mano
Merge branch 'er
/
stop-re
c
ommending-parse
c
v
s
'
i
nto maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C
H
a
mano
Merge br
a
nch 'mh
/
c
e
i
ling' into
m
aint
commit
|
commitdiff
|
tree
2013-01-28
Jun
i
o C H
a
mano
Merge
b
ra
n
ch 'tb/
t
0
05
0
-m
a
i
nt'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hama
n
o
Merge bra
n
ch 'd
l
/am-
h
g-loc
a
l
e'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merg
e
b
ranch 'jc/help'
commit
|
commitdiff
|
tree
2013-01-28
Junio C
Hamano
Merge
b
r
a
nch 'bc/fix-arr
a
y
-
syntax-for-3
.
0-in-compl
e
t
i
on
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
M
atthieu Moy
add: wa
r
n
w
hen
-
u
o
r -A is used wi
t
hout paths
p
e
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
pi
n
g
git-remote-testpy: fix path hashing on Python 3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
John Keepi
n
g
mergetool--lib: don't call "exit"
in setup
_
tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
David
A
guila
r
m
ergetool--l
i
b:
i
mprove sh
o
w_to
o
l_h
e
lp() output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguila
r
mer
g
etools/vi
m
:
r
emove red
u
ndant diff com
m
and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te Wy
c
ko
f
f
git p4
:
in
t
roduce gi
t
ConfigBool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: av
o
id shel
l
when calling git co
n
fig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git
p
4:
a
void shell when invokin
g
git config --
g
et-all
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
P
e
t
e Wyck
o
ff
git p4: a
v
oid sh
e
ll wh
e
n invoking git rev-list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4:
a
vo
i
d shell when mapping users
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyc
k
of
f
git p4: disa
b
le re
a
d-only attribute befo
r
e deletin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyc
k
off
git p
4
t
est: use test_chmod for
c
ygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyc
k
off
g
i
t p
4
:
cygwin p4 client
d
oes not mark r
e
a
d
-only
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete
Wyckoff
git p4 test: av
o
id wildcard * in windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 test: use LineEnd unix in windo
w
s tests too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 test
:
newlin
e
han
d
ling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pe
t
e Wyc
k
off
g
i
t p4: scrub crlf for utf16
f
i
les
on windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
P
e
t
e
Wyckoff
g
i
t p4
:
r
e
move
u
nreachable windows \r\n convers
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
Wyckof
f
git p4
t
est:
translat
e
w
i
ndo
w
s paths
f
or cy
g
win
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyck
o
ff
git p4 test:
s
ta
r
t p4d insid
e
its d
b
dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git
p
4 test: us
e
cl
i
ent_view in t9806
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 test
:
avoi
d
loop in
client_view
Based-on-patch-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 tes
t
: use client_view to build the initial client
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: gen
e
ra
t
e bet
t
er error message for ba
d
depot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next