repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t5551: factor out tag creation
2014-11-14
Davi
d
Aguilar
d
i
f
ftool: honor --trust-exit-code for builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
D
a
vid Agu
i
lar
d
ifftool: add
s
uppo
r
t for --tr
u
st-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
t76
1
0-mer
g
e
t
ool:
add test
c
ases for merg
e
t
o
ol
.
writeTo
T
emp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
mergetoo
l
: add an option
for
w
riting to a t
e
mporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
i
d Aguilar
mergeto
o
l
: use more co
n
servative t
e
mporary file
n
am
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
av
i
d Agu
i
lar
t
est-lib-f
u
nctio
n
s:
adjust st
y
le to match
CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610
-
merget
o
ol:
use
t
es
t
_config
t
o isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merg
e
too
l
s/mel
d
: make u
s
age of `--output`
c
onfigurab
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-sh-se
t
up: move GIT_DIR
i
nit
i
aliz
a
tion
int
o
a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
merge
t
ool: use more co
n
s
e
rvati
v
e
te
m
porary f
i
lenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
g
u
i
lar
test-lib-fu
n
ctions: adj
u
st style
to match Cod
i
ngGuid
e
l
ines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
A
g
uilar
t
7610-mergetoo
l
:
p
refer test_co
n
fig over git
config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id
Aguilar
t7610-mergeto
o
l:
a
dd
m
issing &&
a
nd
remove com
m
ent
e
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Aguilar
t
7
61
0
-mergetool: use tabs instead o
f
a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
D
avid Agui
l
a
r
comple
t
ion: add --show-sig
n
atur
e
fo
r
log and
s
how
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David
A
g
u
ilar
stash: prefer --quiet
o
v
e
r shell redirection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs:
m
ake rev-parse
--qu
i
e
t
actually
q
uiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
D
a
vid Ag
u
ilar
t1503: us
e
test_m
u
s
t_be_e
m
pt
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Agu
i
l
a
r
Doc
u
mentation: a note about
s
t
do
u
t f
o
r git rev-p
a
rse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d Aguilar
cle
a
n
ups: ensure that git-compat-
u
til
.
h
is i
n
cluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
D
avid
A
g
uilar
stylefix: asterisk
s
st
i
c
k
to the variable,
n
ot the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Dav
i
d A
g
u
i
lar
gi
t
k: C
a
t
ch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id Aguilar
git
k
:
U
se
m
ktem
p
-d
t
o avoid predictable temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Ag
u
i
l
ar
gi
t
k: Honor TM
P
DIR when viewing externa
l
diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
D
avid Ag
u
ila
r
diff
t
ool: suppo
r
t repositorie
s
wit
h
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Ag
u
i
l
ar
pul
l
: add --ff-only
t
o
t
he
help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add pull
.
ff configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Da
v
id Aguilar
imap-send
:
e
l
imina
t
e HM
A
C
d
eprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
Agu
i
lar
cache
.
h: e
l
imina
t
e SHA
-
1
d
epr
e
cation warnings
o
n
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Agui
l
a
r
Make
f
il
e
: add support for Apple Co
m
monC
r
yp
t
o facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David
Agu
i
lar
M
a
kefile: fi
x
default reg
e
x
settings
on Darw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David
Agu
i
lar
m
e
r
g
etools/kdiff3: do
n
ot
u
s
e
--
a
ut
o
wh
e
n
diffi
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c
:
add a compatibility com
m
ent to cmd_version(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
i
lar
contrib/mw-to-git/t/install-wi
k
i
.
sh: use a lowe
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid A
g
uila
r
contrib
/
ex
a
mples/
g
it-remote
.
perl:
u
s
e
a
l
owercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
g
uilar
tests:
use a low
e
rcase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
git-
s
vn:
use a lowercase "u
s
a
g
e
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
Do
c
ument
a
tion/user-manual
.
txt: use a l
o
wercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
templat
e
s/
h
ooks
-
-update
.
samp
l
e
: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
lar
contrib/hooks/s
e
tgitperms
.
per
l
: u
s
e
a
lo
w
ercase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
contrib/examples: us
e
a lowercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
contrib/fas
t
-import/
i
m
p
ort-zips
.
py: use spaces instea
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib
/
fast-im
p
ort/import-zips
.
py: fix br
o
k
en erro
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contr
i
b
/fast-impo
r
t: use a l
o
werc
a
se
"
usa
g
e:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
g
uilar
contrib
/
credential:
use a
l
ow
e
rc
a
se
"
u
sage:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agui
l
ar
g
it-cvsim
p
o
r
t: use a low
e
rcase "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
ilar
git
-
c
v
simport:
u
s
e a
l
o
wercas
e
"usage:" s
t
ri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d Aguil
a
r
git-cvsexportcommit:
u
se a l
o
wercase "us
a
ge
:
"
s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
gu
i
lar
git-archimport: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agu
i
l
ar
git-merge-one-f
i
le: use a l
o
w
e
rcas
e
"u
s
age:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
r
elin
k
: u
s
e
a lowerc
a
se "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-
s
vn: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-sh-setup: use a lowercase
"usage
:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
v
i
d Agui
l
ar
t7800: "de
f
aults
"
is no longer
a builtin tool nam
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Ag
u
ilar
t78
0
0
:
moderni
z
e te
s
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Da
v
id Agui
l
ar
t7800: update
c
opyrigh
t
notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Agu
i
lar
difftool: silence uniniti
a
lized variable
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
p4merge: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid
Aguilar
d
i
fftool--
h
elpe
r
: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Ag
u
ilar
do
c
:
g
ene
r
ate a l
i
st of valid
m
e
r
ge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Agu
i
lar
mergetool--lib: add functi
o
ns f
o
r fin
d
ing avai
l
able
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agu
i
lar
m
e
r
getoo
l
-
-
lib: improv
e
the
h
elp
t
ext in guess_m
e
r
g
e_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Ag
u
il
a
r
me
r
getool--lib: simplify command expre
s
sions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools: simplify
how we handle "
v
i
m
"
a
n
d "defau
l
t
s"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid A
g
uilar
m
e
r
g
et
o
ol--lib:
imp
r
ove show_tool_help() outp
u
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
mergetools/
v
im: remove redundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
avid Agui
l
ar
m
ergetools/p4merge: Ho
n
or $TMPDIR
for the /d
e
v/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
avid Ag
u
ilar
merg
e
t
o
ols/p4mer
g
e: Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Da
v
i
d Aguilar
m
e
rg
e
tool--lib
:
Allow custom commands
t
o overr
i
de bu
i
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id Aguilar
gitk:
Rename 'ta
g
contents'
t
o '
c
a
c
h
ed_ta
g
content'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
gu
i
la
r
gitk: Teach "Reread refe
r
ence
s
" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d
Aguilar
mergetool,difftoo
l
: Docu
m
ent --tool-help consis
t
e
ntly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguila
r
difftool: Dis
a
ble --symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
tool: Handle co
m
p
are() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
l
a
r
d
i
fftool: Wrap long l
i
nes f
o
r re
a
d
a
bility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guilar
diffto
o
l: Ch
e
ck
all return codes from co
m
pare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
difftool
:
Handle
f
i
n
ding merg
e
tools
/
in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool: Use symlinks when
diffing against t
h
e worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uil
a
r
difftool: Call the
temp dire
c
tory "git-
d
iffto
o
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool: Mov
e
op
t
ion values
into
a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
difftool: Eli
m
i
n
ate global
var
i
able
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
Aguilar
difftool
:
Simplify print
_
tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t
7
80
0
: Tes
t
difftool passing arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vi
d
Ag
u
ilar
m
ergetool: Provide an em
p
ty file
w
he
n
n
e
eded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguila
r
M
a
kefil
e
: Impr
o
ve c
o
mpiler header dependency che
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
r
get
o
o
l
s
/meld: Use '--
o
utp
u
t' when a
v
ailable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uila
r
merget
o
ol
-
-lib:
R
efac
t
or t
o
ols int
o
sep
a
rate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
erget
o
ol--l
i
b: Make st
y
le
co
n
sistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool--he
l
per: Ma
k
e
s
tyl
e
cons
i
stent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David
A
guilar
t/t
7
503-pre-comm
i
t-hook
.
sh
:
Add GIT_PREFIX
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
A
g
uil
a
r
gi
t
-mergetool--lib
:
Make vimdiff retai
n
the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
git
:
Remove hand
l
in
g
for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guil
a
r
set
u
p
: P
r
ovide GIT_PREFIX
to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync: Upd
a
te "sub
m
od
u
l
e
.
<name>
.
url
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
e
rgetool: Sk
i
p
a
utor
e
s
o
lved pa
t
h
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation: Expla
i
n git-mergetool's
use of tempora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David
Aguilar
M
a
kefile: Remov
e
u
s
age of deprecate
d
Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix
'
-
-
gui' wh
e
n di
f
f
.
guitool i
s
u
nconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David
Aguilar
t78
0
0
-
difftool
.
sh: Test mergetool
.
prompt fa
l
lback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Ag
u
i
l
ar
difftool:
Update
c
opyright no
t
ices t
o
list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next