repo.or.cz
/
git
/
mingw.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/diff-graph-cleanup'
2013-02-04
Mar
c
Khouzam
c
omple
t
ion: handl
e
p
a
th completion
a
n
d colon for tcsh
.
.
.
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/ap
p
ly: tighten (dis)si
m
ilarit
y
index
p
arsi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-03
Junio
C
Ham
a
n
o
c
om
b
ine-diff: lift 32
-
way limit of combined diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
Aguilar
doc:
g
enerate a l
i
s
t
of valid merge tools
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
mergetool--lib: list
u
s
er co
n
figured tools
in '--tool
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
id Aguilar
merg
e
tool--
l
i
b
:
add funct
i
o
ns for finding av
a
ila
b
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-03
Christo
p
h J
.
Tho
m
pson
Honor co
n
figure's ht
m
l
d
ir s
w
it
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-02
Jonathan
N
iede
r
Mak
e
file: exp
l
icitly set targe
t
name for a
u
t
o
gener
a
te
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-02
Sven Strickroth
me
r
getool
s
: teach t
o
rtoisemerge to handle file
n
ames
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Jo
h
n Keeping
Rename {git- => git}remote-helpe
r
s
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Stephen Boyd
run-com
m
and: be
m
o
re in
f
ormati
v
e
a
b
o
ut what faile
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
T
homas Ack
e
r
m
ann
D
o
c
u
ment
a
tion: StGit is the righ
t
s
pelling,
not StGIT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hamano
Documentation: describ
e
the "r
e
pository" in reposit
o
r
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Thomas Acker
m
ann
D
o
cumentation
:
add a descri
p
t
ion fo
r
'git
f
ile' to glossar
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Tho
m
as Ackermann
Documentation: do not use unde
f
i
n
ed terms
g
it-d
i
r and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Thomas Ackermann
Docum
e
nt
a
tion: the nam
e
o
f the
s
ystem is 'Gi
t
', not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Thoma
s
Ackermann
Docume
n
tation: avoid
p
oor-m
a
n
'
s smal
l
caps GIT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hamano
Update d
r
aft
r
elease
notes
t
o 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Junio C
Hamano
Merge branch 'nd/
e
dit-br
a
nch-des
c
-
whil
e
-d
e
tached'
commit
|
commitdiff
|
tree
2013-02-01
Junio C H
a
mano
M
e
rge branch '
j
k/gc-auto-a
f
te
r
-
f
et
c
h'
commit
|
commitdiff
|
tree
2013-02-01
J
u
nio
C Hama
n
o
M
e
rge branch 'bc/g
i
t
-p4-for-
p
yt
h
on-2
.
4'
commit
|
commitdiff
|
tree
2013-02-01
Ju
n
io C Hamano
Merge branch 'j
n
/do-not-dr
o
p-username-when-reading
.
.
.
commit
|
commitdiff
|
tree
2013-02-01
J
u
nio
C
Hamano
Merg
e
branch '
j
k/
c
vs
i
mport
-
does-not-wo
r
k-with-cvsps3'
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hamano
M
erge bra
n
ch '
j
c
/
do
-
not-let-random-file-i
n
ter
f
ere
-
with
.
.
.
commit
|
commitdiff
|
tree
2013-02-01
Junio
C
H
a
mano
Me
r
g
e branch
'as/test-clean
u
p'
commit
|
commitdiff
|
tree
2013-02-01
Junio C Haman
o
Merge branch 'j
c
/no-
g
it-confi
g
-in-clone'
commit
|
commitdiff
|
tree
2013-02-01
Ju
n
io C Ham
a
no
M
e
rge b
r
anch 'nd/
f
etch-depth-is-
b
r
o
ken'
commit
|
commitdiff
|
tree
2013-02-01
Jeff King
Documentatio
n
/Makefile: clean up
M
AN*_TXT
li
s
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Juni
o
C
H
a
mano
apply: diagnose incomplete s
u
b
mod
u
le
object
n
ame better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Junio
C Ham
a
no
apply: s
i
mpli
f
y build_fake
_
ancestor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Junio C Ha
m
ano
g
i
t
-am:
record ful
l
index li
n
e i
n
t
h
e patch u
s
ed
w
hile
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Jeff Kin
g
b
ranch: l
e
t
b
ranch
f
ilters impl
y
-
-
l
i
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Jeff
King
docs: clari
f
y git-br
a
nch --
l
i
s
t behavior
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-31
St
e
p
h
en Boyd
gpg: c
l
ose stde
r
r
o
nce finished with it in verify
_
s
ign
e
d_buf
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-31
Steph
e
n Boyd
g
p
g: all
o
w tr
a
nslat
i
on of more error
m
e
ssa
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-31
Fr
a
ser T
w
eeda
l
e
p
u
sh: f
i
x
s
egfa
u
lt when
H
EAD points n
o
where
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Ju
n
i
o
C H
a
mano
M
e
rge git://ozlabs
.
org/~paulus/gitk
commit
|
commitdiff
|
tree
2013-01-30
John Keepi
n
g
CodingGuidelines:
add
P
y
t
ho
n
coding
guidelines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
J
u
nio C Ham
a
no
g
i
t_r
e
mote_helpers: remove GIT-PYTHON-VE
R
SION upo
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
J
unio
C
Hamano
INS
T
ALL: git
-
p4 does n
o
t support Py
t
hon 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
N
g
uy
ễ
n Thái Ngọc Duy
b
r
anch: mark
m
or
e
string
s
for
t
ranslation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Junio
C
Hamano
Merge
branch 'nd/e
d
it-
b
ranch-desc-while-det
a
ched' into
.
.
.
commit
|
commitdiff
|
tree
2013-01-30
N
guyễn T
h
ái
Ng
ọ
c
Duy
bra
n
ch: give a more help
f
u
l message
on redundant arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Nguyễn Thái Ngọc Duy
branch: r
e
j
ect -D/-d without bran
c
h
n
ame
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Nguy
ễ
n Thá
i
Ngọc Duy
br
a
nch: no detac
h
ed HE
A
D
che
c
k when e
d
iti
n
g
another
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hamano
M
e
rg
e
branch 'rr/minimal-st
a
t'
commit
|
commitdiff
|
tree
2013-01-30
Junio
C
H
a
mano
M
erge b
r
an
c
h 'n
d
/magic-pathspec-fr
o
m-root'
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hama
n
o
Mer
g
e
b
ra
n
ch 'tb/t0050
-
maint' into maint
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
m
e
rgetool-
-
lib:
improve the help text in guess_
m
e
r
ge_to
o
l
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib: si
m
plify command exp
r
essions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
Junio
C
Hamano
Me
r
g
e
branch 'nd/f
i
x-directory-attr
s
-off-by-one
'
into
.
.
.
commit
|
commitdiff
|
tree
2013-01-29
Junio C Hamano
Merge bran
c
h
'ph/reba
s
e-preserve-all-m
e
r
g
es'
i
nt
o
maint
commit
|
commitdiff
|
tree
2013-01-29
Junio C Hamano
RE
A
DME:
u
pdat
e
stale and/or inco
r
rect inf
o
rmati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguila
r
mergetools: simplify how we handl
e
"v
i
m" and
"
d
efault
s
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
A
n
drej E
B
a
ranov
gitweb: refer to picon/gravatar imag
e
s ov
e
r
t
he same
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
J
u
n
io C
H
amano
U
p
date draft release notes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
J
u
nio C
H
amano
Sync with 1
.
8
.
1
.
2
commit
|
commitdiff
|
tree
2013-01-28
J
unio C H
a
m
an
o
Git 1
.
8
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Junio C
H
amano
M
erge
branch
'
ss/help-ht
m
lpath-con
f
i
g
-
doc' i
n
to maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ham
a
n
o
M
erge branch 'nd/
a
ttr-debug
-
fix' into m
a
int
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge branch 'ds/
c
omp
l
etion-silence-i
n
-
t
ree-p
a
th
-
pr
o
be
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C H
a
mano
M
e
rge
br
a
n
ch 'j
n
/
m
a
i
nt-t
r
i
m
-vi
m
-contrib' into main
t
commit
|
commitdiff
|
tree
2013-01-28
Junio C
H
a
man
o
Merge branch
'
p
e/doc-email
-
env-is-trumped-by-
c
o
nfig
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
J
unio C
H
amano
M
e
rge br
a
nch 'mk/c
o
mplete-tcsh
'
i
n
to maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge branc
h
'ap/status-i
g
n
o
r
e
d-
i
n-ignored-dir
e
ctory
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ham
a
no
Merge
b
r
a
nch
'
er/sto
p
-recomm
e
n
ding-parsecvs' into maint
commit
|
commitdiff
|
tree
2013-01-28
Jun
i
o
C Ha
m
ano
Merge branc
h
'
m
h
/
ceiling' into maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Haman
o
Merge branch '
t
b
/
t0050
-
maint
'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
M
erge branch
'dl/am-hg-locale'
commit
|
commitdiff
|
tree
2013-01-28
J
u
nio C Hamano
Merge bran
c
h 'jc
/
he
l
p'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Mer
g
e branch 'bc
/
f
ix-array-syntax-for-3
.
0-i
n
-completion
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Matthieu
M
oy
add:
w
a
r
n w
h
en -u or -A is
used without pathspec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
git-re
m
ote-testp
y
: fix pa
t
h
hashing o
n
Python 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool--lib:
d
on't call
"e
x
it" in setup_too
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
avi
d
Aguila
r
mergetool--lib: improve show_tool_h
e
lp() output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ila
r
mergetools/vim:
r
emo
v
e redundant diff
comm
a
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te Wyckoff
g
it
p
4
: introd
u
ce gitConfigBool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te
Wycko
f
f
git p4: a
v
o
i
d
sh
e
ll
when
c
a
l
li
n
g git c
o
nfig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
gi
t
p4: avo
i
d s
h
ell when invo
k
i
ng g
i
t con
f
ig
--get-all
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wy
c
koff
git p4: avoid
s
hell
w
hen invoking git rev-list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wycko
f
f
git
p4: avoid shell when mappi
n
g users
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
g
i
t
p4: disable
read-only attr
i
bute
b
efore de
l
eting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
ete Wyck
o
ff
git p4 test: use test_chmod for cygwi
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pe
t
e Wyckoff
git p4: cygwin
p4 client
does not mark re
a
d-on
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
g
it p4 test: avoid wildca
r
d *
i
n wind
o
w
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git
p4 test
:
use LineEnd unix in windows tests too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
gi
t
p4
test: ne
w
line
handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wy
c
koff
git p4: scrub cr
l
f
for utf16
f
i
l
es on w
i
ndows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
ckoff
git p4: r
e
move unreach
a
ble
w
indo
w
s
\
r
\n conv
e
r
s
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
gi
t
p4 test: translate windows pat
h
s
f
or
c
y
gwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 test
:
start p4d inside its db dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pe
t
e Wy
c
k
off
git p4 test: use cl
i
e
nt_view in t9806
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git
p
4
t
e
st: avoid loo
p
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
W
y
c
koff
gi
t
p4 tes
t
: use client_view to build the
i
niti
a
l clien
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
Wyc
k
off
git p4
:
g
e
nerate bet
t
e
r error message
f
or bad depot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
Wyckoff
git p4: remov
e
unused imports
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
ete
Wyckoff
git p4: temp branc
h
na
m
e
s
hould use / even on windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Ju
n
i
o C Hamano
Merge bra
n
ch 'jk/maint
-
gc-auto-after-fetch' into j
k
.
.
.
commit
|
commitdiff
|
tree
2013-01-27
Jeff
K
ing
fetch-pack: avoid repeatedly re-scanning pac
k
di
r
e
ctory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next