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
mergetool: add an option for writing to a temporary directory
2014-10-16
Davi
d
Aguilar
mergetoo
l
: add an option for writi
n
g to
a
tempora
r
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
mergetoo
l
: use mo
r
e
c
on
s
ervat
i
ve te
m
p
orary filenames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
test-lib-functions:
adjust style to match
CodingGuidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
t761
0
-
m
erge
t
oo
l
:
use test_config to
i
s
o
late
t
e
st
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
t7610-mer
g
e
to
o
l: add missing
&&
a
nd remove commented
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool
:
use tabs instead
of a mix of tabs
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David A
g
uilar
difftool: suppo
r
t rep
o
s
i
to
r
ies with
.
gi
t
-files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David
Aguila
r
pu
l
l: add --ff-only to the
help text
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Aguila
r
p
u
ll: add
pull
.
ff configura
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
Da
v
id A
g
uila
r
imap-send: eliminate HMAC
deprecation warnings o
n
M
a
c
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David A
g
uilar
c
a
che
.
h: eliminate SHA-1 deprecation
war
n
ings
o
n
Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
id Agu
i
lar
Makef
i
le:
a
dd support fo
r
Apple CommonC
r
ypto f
a
cility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
M
a
kefile: fix
d
e
f
ault regex s
e
tt
i
ngs
o
n Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David
Aguilar
mergeto
o
ls/kdiff3: do n
o
t use --aut
o
when
diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d Ag
u
ilar
help
.
c
: add a compa
t
ibili
t
y comment t
o
c
m
d_v
e
rsion()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
c
o
ntrib/m
w
-
to-git
/
t/install-wiki
.
sh: use a lowerca
s
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
c
o
ntrib/e
x
amples/g
i
t
-
remot
e
.
per
l
: use
a
lower
c
ase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
te
s
ts:
u
se a
l
owercase "usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
git-svn:
u
se a lowerc
a
se "u
s
a
ge:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agu
i
lar
Documentation/
u
ser-m
a
n
ual
.
txt: use a lower
c
a
se "us
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
t
e
m
p
lates/hooks--upd
a
t
e
.
sample: us
e
a lo
w
ercase
"
usa
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/
h
ooks/setg
i
tperms
.
perl: u
s
e a lowercase "usa
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uila
r
contrib
/
examples: use a
lowe
r
case "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-import/i
m
p
ort-zips
.
py:
use s
p
a
c
es instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agui
l
ar
contrib/fast-import/import-
z
ips
.
py: fix broken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
c
ontr
i
b/fas
t
-import: use a lowe
r
case
"usage
:
"
strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/credential:
use a lowercase
"usage:
"
str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvs
i
mpor
t
: use
a
low
e
rcase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-cvsimport
:
use
a
lower
c
ase
"
usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-cvsexportcommit: use a lowercase "usa
g
e:
"
str
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-a
r
chimport: use a
lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t
-
me
r
ge-one-file: use a
lowercase "usa
g
e:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
g
it-
r
elink: us
e
a l
o
wercase "usage:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-svn:
u
se a lowerca
s
e "
u
sage:"
s
trin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agu
i
lar
git-sh-setup
:
use
a
lowerca
s
e
"
usage:
"
stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Agui
l
a
r
t7800: "defaults" is no
l
ong
e
r a b
u
ilti
n
t
o
ol name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vi
d
Aguila
r
t7800: modernize
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
D
a
v
i
d
Aguilar
t
7
800:
u
pdate copyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
Davi
d
Agui
l
ar
difftoo
l
: sil
e
n
ce uninitialized v
a
riable
w
ar
n
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p
4
me
r
ge: fix p
r
intf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id
A
guilar
di
f
ftool--help
e
r: fix printf
usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ilar
doc:
g
ener
a
te a list of valid merge tool
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
Aguilar
mergetool--li
b
:
add functions for
finding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib: impro
v
e the help te
x
t
i
n guess_
m
erg
e
_tool
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
rge
t
ool--lib: simp
l
i
f
y
c
ommand ex
p
ress
i
o
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetools: simp
l
ify how w
e
handle "vim" and "defa
u
lt
s
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vi
d
Aguilar
me
r
ge
t
ool--lib: im
p
rove
s
how_tool_help() outpu
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
me
r
ge
t
ools
/
vi
m
: remov
e
red
u
ndant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Agui
l
ar
m
e
rgetools/p4me
r
ge
:
Honor
$
T
MPDIR for the /dev
/
null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mer
g
etools/p4merge: Handle
"/dev/nul
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
Da
v
id Agu
i
lar
mergetool--lib: Allow custom commands to override bu
i
lt-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
A
guilar
gitk: Rename 'ta
g
content
s
'
to 'ca
c
hed_ta
g
co
n
tent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
gitk: Teach "Rer
e
ad references" to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David A
g
uilar
mergeto
o
l,diff
t
ool
:
D
o
cu
m
ent -
-
tool-help consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
A
g
uilar
difftool: Disable -
-
sym
l
inks on
c
ygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
di
f
f
tool: Ha
n
dle compa
r
e()
r
eturning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Ag
u
ila
r
difftool: Wrap lon
g
li
n
es for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftoo
l
: Check all
r
eturn codes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
difftool:
Handle f
i
nding merg
e
tools/ in a path w
i
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
difftool: Use s
y
mlinks when diffing against the
w
o
r
ktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
Aguilar
difftool: Call the tem
p
d
i
rectory "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
difftool: M
o
ve opti
o
n valu
e
s i
n
to a h
a
sh
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Ag
u
ilar
difftool: Eliminate
global var
i
ables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Agui
l
ar
di
f
ftool: Simplify print
_
tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
a
vid Aguilar
t7800
:
Test
di
f
ftool passing
a
r
g
uments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool: Provide an empty
file wh
e
n
n
eeded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Impr
o
ve
c
o
m
p
ile
r
he
a
de
r
dependency ch
e
ck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vi
d
Aguilar
mergetoo
l
s/meld: Use
'
--outp
u
t
'
when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Agui
l
ar
mergetool--lib: Refactor tools
i
nto sepa
r
at
e
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id A
g
uilar
mergetool--li
b
: Make style cons
i
st
e
nt with
gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
difftool--h
e
lper: Make style consist
e
nt with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
D
av
i
d Aguilar
t/t7503-p
r
e-commit-hook
.
sh: Add GIT
_
PR
E
FIX
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-merg
e
tool--lib
:
M
ake vimdiff retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Ag
u
ilar
git: Remove hand
l
in
g
for GIT
_
PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
setup: Pr
o
v
i
de
G
IT_PREFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submod
u
le sync: Update "su
b
module
.
<n
a
me>
.
u
rl"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David A
g
u
i
lar
merge
t
ool: Sk
i
p autoresolved
paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
a
v
i
d Ag
u
ilar
Documentation: Explain git
-
mergetool's use of tempora
r
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David
Aguilar
Makefile: R
e
move usage of deprec
a
ted Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Ag
u
ilar
difftool: Fix '--
g
ui'
w
hen di
f
f
.
guitool is un
c
o
n
figu
r
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David
A
guil
a
r
t
7800-difftoo
l
.
sh: Test m
e
r
g
etool
.
prompt f
a
llback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid A
g
uilar
dif
f
tool
:
Upda
t
e copyrigh
t
notices to
list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
d
ifftool: Use eval to ex
p
and '--extcmd' expres
s
ions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id
A
guilar
difftool:
A
d
d
'-
x
'
and as an alia
s
for
'--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
Agu
i
l
a
r
t780
0
-difftool
.
sh: Simplify the --ext
c
md test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git
-
diff
.
txt: Link
to git-di
f
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diff
t
o
o
l: Al
l
ow specifying un
c
o
n
figured commands
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
difftool-
-
h
elper: Remove
u
s
e o
f
the GI
T
_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Agui
l
ar
diff
t
ool--he
l
per: Update
copyright and remove distract
i
n
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid A
g
ui
l
a
r
git
-
d
i
ff
t
ool:
Add
'
-
-
gui
'
for selecting
a
GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t
7
8
00-difftool: Set
a
bogus tool fo
r
use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
avid Aguila
r
help: Do
n
o
t
unnecess
a
ril
y
l
o
ok
f
o
r
a repo
s
ito
r
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
i
d
A
guilar
submodule
.
c: S
q
uelch
a
"use befor
e
assignmen
t
" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Agui
l
ar
diff: gen
e
rate pretty filenames i
n
p
r
ep_
t
em
p
_b
l
o
b
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a basename() compatibility fu
n
ct
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
compat
:
add
a
mkstemps() c
o
m
patibility
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vi
d
Aguilar
Add git-replace
t
o
.
g
iti
g
nore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
A
g
u
ilar
mergetoo
l
--lib: add suppor
t
for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
merg
e
tool--lib: specialize diff opt
i
ons
f
or emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Agui
l
ar
mergetool--lib: simp
l
ify API u
s
age
b
y remo
v
ing m
o
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next