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
difftool: add support for --trust-exit-code
2014-10-28
David Aguilar
difftool:
a
dd support for --trust-exi
t
-code
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
David Agui
l
ar
g
i
tk
:
Ca
t
ch mkdt
e
mp errors
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David
A
gu
i
lar
gitk: Use mktemp -d
t
o avoid predi
c
table tem
p
orary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
Davi
d
Agui
l
ar
gitk:
H
onor TMPDIR
when viewi
n
g
e
xte
r
nal
diffs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
D
a
vid
A
g
uilar
difftool
:
support repositori
e
s
with
.
git-fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
D
a
v
id Agu
i
l
a
r
pull: a
d
d
-
-ff-
o
nly t
o
the help t
e
xt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Ag
u
i
l
ar
pull: add pull
.
ff configuration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
Da
v
id Ag
u
ilar
im
a
p-send: elimi
n
ate HMAC deprecation
warnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David
Aguilar
cache
.
h: elimin
a
te
S
HA-
1
deprecation warnings on M
a
c
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile: add s
u
pport for Ap
p
l
e
CommonCryp
t
o facil
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
D
avi
d
Aguila
r
Mak
e
file: fi
x
default regex
s
ettings o
n
Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
D
avid Aguilar
mergetool
s
/
kdiff3: do not use --auto when diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
Da
v
id Agui
l
ar
h
e
lp
.
c: add
a compatibility comment to cmd_version()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
lar
contrib/mw-to-git/t/install-wiki
.
sh: use a lower
c
a
s
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
ar
contri
b
/
e
xamples/git-remote
.
pe
r
l: use a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
ar
tests: use a
lowe
r
case "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Ag
u
i
l
a
r
gi
t
-svn
:
use
a
l
o
werca
s
e
"
usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
i
l
a
r
D
ocumentation/user
-
manua
l
.
t
xt: use a l
o
w
e
r
c
ase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
templates
/
h
o
oks--
u
pda
t
e
.
sample: use a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/hooks/set
g
it
p
erms
.
perl: use a low
e
rcas
e
"usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguilar
c
o
ntr
i
b/exampl
e
s: use a lowerc
a
s
e
"usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
co
n
trib
/
fast-i
m
port/
i
mp
o
rt-zip
s
.
py: use spaces i
n
s
t
e
ad
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
ui
l
ar
c
ontrib
/
fast-import/import-z
i
ps
.
py: fix broken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
Ag
u
ilar
contrib/fast-i
m
port:
use a lowe
r
case "
u
s
a
g
e:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agu
i
lar
con
t
rib/cre
d
ential: use a lowercase "usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git
-
cvsimport: use a lower
c
ase
"
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-cvsimport: use
a
l
o
w
ercase "u
s
a
ge
:
" st
r
in
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-cvsexportcommit: us
e
a lowercase "u
s
ag
e
:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Agu
i
lar
git-arc
h
i
m
port
:
use a l
o
we
r
case "usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-one
-
file: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-relink: u
s
e
a
lower
c
ase "usage:"
s
t
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguil
a
r
git-svn:
u
se
a
lowe
r
cas
e
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-sh-setup: use a lowercase "usage:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid Aguila
r
t
7
800:
"defaults" is
n
o longer a builtin
t
ool name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: modernize t
e
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Agui
l
ar
t7800: updat
e
copy
r
igh
t
n
o
tice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
d
i
f
ftoo
l
: silence uninitia
l
ized
variable wa
r
ning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
A
g
uilar
p4
m
e
r
ge: fix printf
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
i
d
Aguilar
difftool
-
-hel
p
e
r
: fix printf u
s
age
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
avid A
g
uilar
doc:
ge
n
e
rate a list of
valid
m
er
g
e to
o
ls
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
m
er
g
etool-
-
lib: add fu
n
c
tions fo
r
f
in
d
ing available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
mergetool--lib: imp
r
ove
t
he he
l
p text in guess_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mer
g
etool--lib
:
si
m
plif
y
comm
a
n
d
expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
i
d
Aguilar
mergetools: simplify how w
e
handle "
v
im" and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Agui
l
ar
mergetool--li
b
: i
m
pro
v
e
show_tool_h
e
l
p()
o
utput
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
v
id Aguilar
m
e
r
getool
s
/
vim: rem
o
ve redun
d
a
nt di
f
f co
m
man
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Aguilar
m
e
rgetools/p4me
r
ge:
Honor
$
T
M
PDIR
for t
h
e /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Agu
i
lar
merg
e
tools/p
4
merge: Handle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
D
avid Aguilar
mer
g
etoo
l
--lib: A
l
low c
u
stom co
m
mand
s
to
o
verr
i
de built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Re
n
ame 'tagcontents'
to 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk:
T
each "Reread references"
t
o reload t
a
gs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David A
g
uilar
mergeto
o
l,difftool: Do
c
ument --to
o
l-help consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
lar
d
iff
t
oo
l
:
D
isable -
-
s
y
mlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguil
a
r
d
ifft
o
ol: Handle compare
(
) returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guila
r
diffto
o
l: Wra
p
l
ong li
n
es f
o
r readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Agu
i
l
a
r
difftool: Check
a
ll return c
o
d
e
s from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguil
a
r
difftool: Handle finding mergetools/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Agui
l
ar
d
ifft
o
ol: Use symlinks w
h
en diffing agai
n
st the wo
r
ktr
e
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id A
g
uilar
di
f
ftool
:
Call the temp di
r
ectory "git-diff
t
ool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
di
f
ftool: Move option values into a h
a
sh
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l
:
El
i
m
inate glob
a
l variabl
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Agui
l
ar
difftool: S
i
mp
l
ify
prin
t
_
tool_
h
elp()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Ag
u
ila
r
t7800: Te
s
t
di
f
ftool
pa
s
s
ing arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Agu
i
lar
mergetool: Provide a
n
emp
t
y
f
i
le when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Improv
e
compiler head
e
r
dependency
check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
me
r
getools/meld: Use '--out
p
ut' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid
A
guilar
mergetool--lib:
R
efact
o
r
tools into
separate fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
me
r
geto
o
l--lib: Make style consiste
n
t w
i
th gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid
A
guilar
difftool--helpe
r
:
M
ak
e
style consiste
n
t with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguila
r
t/
t
7
503-pre-co
m
m
it-hoo
k
.
sh: Add GIT_PREFIX t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetool
-
-
lib:
M
ake v
i
m
d
iff retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
git: Remove handling for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provide
G
IT_PREFIX t
o
built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submo
d
ule sync: Update
"submodule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
av
i
d Aguilar
merge
t
ool:
Skip
aut
o
resolved pa
t
h
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Aguilar
Document
a
tion: Exp
l
ain g
i
t
-
mergetool's use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
avid Aguilar
Makefile: Remove usage of dep
r
eca
t
ed Python "has
_
key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '-
-
gui' when diff
.
gui
t
ool is
unconfig
u
red
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Davi
d
Ag
u
il
a
r
t7800-difftool
.
s
h:
T
es
t
mergetool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Agu
i
lar
difftool:
Up
d
ate
copy
r
ight notices to
lis
t
e
a
c
h ye
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
d
ifftool: Use eval to ex
p
and '--extc
m
d
' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
difftool: Add '-x' and as an alias
for '
-
-ext
c
md'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d A
g
uilar
t7800-difftool
.
sh:
Si
m
plify the --ex
t
cmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
gu
i
l
ar
git-diff
.
txt: Link
t
o git-diff
t
o
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguil
a
r
difftool
:
Allow
specifying uncon
f
ig
u
red com
m
ands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--helper
:
R
e
move us
e
of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
difftool--h
e
lper: Upd
a
te copyright a
n
d remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
git
-
d
ifftool
:
Add '--g
u
i' for select
i
n
g
a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
t7800-d
i
fftool: Set a bogus too
l
for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
A
guilar
help: Do not u
n
necess
a
rily look for a
r
e
po
s
itory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Agu
i
lar
sub
m
odule
.
c: Squelch a "use
before assig
n
men
t
" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
di
f
f: generate
pretty
filenames in p
r
ep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
u
ilar
c
ompat: add a base
n
ame() compati
b
ility fu
n
c
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
co
m
pat: add a mkstemp
s
()
compatibility func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
Add git
-
replace to
.
g
i
tignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
m
e
r
getool-
-
li
b
:
ad
d
support for a
r
axis
merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
A
guilar
mergetool--lib:
s
p
e
c
ialize
diff optio
n
s for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
avi
d
Aguilar
mergetool--li
b
:
s
implify AP
I
us
a
ge by
removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool/mer
g
etool: refa
c
t
or co
m
mands to use git-mer
g
etool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
mergetool: use $(
.
.
.
) instead of `
b
a
c
kticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next