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: simplify conditionals
2014-11-21
Dav
i
d
Aguilar
m
ergetool: simplify c
o
nditionals
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Aguil
a
r
difftool--helper:
a
dd explici
t
exit statement
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
D
avid
Aguilar
merget
o
ol--lib
:
remove use
o
f
$statu
s
global
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-14
D
a
vid Agui
l
a
r
difftool: honor --trust-exit-code
f
or builtin tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
difftool: add support f
o
r
--trust-exit-code
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Ag
u
ilar
t76
1
0-merg
e
tool: add
test cases f
o
r merge
t
ool
.
writeT
o
Temp
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool: add an option
for wr
i
tin
g
to
a
t
e
mpora
r
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
me
r
getool: use
more conservati
v
e tempor
a
r
y
filena
m
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
test
-
lib-functions: adjust s
t
y
le to match CodingGuidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
Ag
u
ilar
t7610-merg
e
t
ool: use test_config t
o
isolate
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
mergetools/mel
d
: make usage of
`
-
-o
u
tput` confi
g
u
r
able
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
git-sh-setup: move GIT_D
I
R
i
n
itial
i
zation into a function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguila
r
m
ergetool: use
m
ore conservative tempo
r
a
r
y filenames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
test-lib-functions: ad
j
us
t
s
tyle to m
a
t
ch Cod
i
ngGuidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
avid
A
guilar
t7610-mergetool: prefer
t
e
st_config
over git confi
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguilar
t7610-me
r
getool: add missing && and r
e
mo
v
e
commented
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
u
ilar
t7610-mergetool: us
e
tabs instead of a mi
x
of ta
b
s
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-07
David
A
guilar
compl
e
tion:
add --sh
o
w-signature for
log and show
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
David
A
gu
i
l
ar
stash: prefer --quiet over shell redirection of the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
id Aguilar
refs: ma
k
e
r
ev-par
s
e
-
-
quiet actuall
y
quiet
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-16
David A
g
u
i
l
ar
t150
3
: use test_must_be_empty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d Agu
i
lar
Docume
n
tation
:
a no
t
e
abo
u
t
stdout for
g
it
r
e
v
-par
s
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
D
avid Aguil
a
r
cleanups: en
s
ure that
g
i
t-compat-util
.
h is included
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-02
David Agui
l
ar
stylefix: a
s
terisks stick to
the
v
ariabl
e
, not the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
Da
v
id A
g
uilar
gitk: Catch
mkdtemp e
r
rors
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David A
g
uilar
gitk: Use mktemp -d to avoid pre
d
icta
b
le tempo
r
ary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
g
i
tk: Ho
n
or TMP
D
IR when
viewing external diffs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David
Aguilar
dif
f
tool
:
suppo
r
t repo
s
itori
e
s
w
i
th
.
git-files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d Aguilar
p
u
ll: a
d
d --
f
f-only to the help tex
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
id
Aguilar
pull: ad
d
p
ull
.
ff c
o
nfiguration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David Ag
u
ilar
ima
p
-send: e
l
iminate HMAC depr
e
cation warnings
o
n Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vi
d
Ag
u
ilar
c
ach
e
.
h
:
eliminate SHA-1 d
e
pr
e
c
a
tion warni
n
gs
on
M
a
c
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Aguila
r
Makefile: add supp
o
r
t
for
A
p
p
l
e CommonCrypto facilit
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
David A
g
uil
a
r
Make
f
ile: fix defaul
t
regex sett
i
ngs
on Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/
k
diff3: do not use
--auto when diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
D
a
v
id Aguilar
he
l
p
.
c: a
d
d a compat
i
b
i
lity comment to cmd_
v
ersion()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
contrib/mw-to-git
/
t/install-wik
i
.
sh: use
a
lowerca
s
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d
Aguilar
contrib
/
examples/
g
it-remote
.
perl
:
u
se a l
o
w
e
rcase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
tests
:
use a low
e
rca
s
e "
u
s
a
ge:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
git
-
svn: use a lowercase
"u
s
age:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Documen
t
ation/user-man
u
al
.
txt: use a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguil
a
r
te
m
plates/hooks--updat
e
.
sampl
e
: use a lowercase "
u
sage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
c
o
ntrib/hooks/setgitperms
.
perl:
use a low
e
rcase "usa
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
con
t
rib/
e
xamples
:
use
a lowercase "u
s
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib
/
f
a
st-impor
t
/import-
z
i
p
s
.
p
y: use spaces i
n
stea
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
contrib/fast-import
/
im
p
ort-
z
ips
.
p
y: fi
x
broken
error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
guilar
contrib/fast-import:
u
se
a lowercase "u
s
a
g
e
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/credential: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
c
vsimport: use a lowercase "usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-cvsimpo
r
t
:
use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-cvsexportcomm
i
t: use a lowercase "u
s
a
g
e
:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
a
rchimport: use a lowercase "u
s
a
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
gi
t
-merge-one-fi
l
e: use a lowercas
e
"usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relink: use
a
lowercase "
u
sa
g
e:"
s
tr
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-svn: use a
l
owercase
"
usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
s
h-s
e
tup: use a lowercase "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Ag
u
il
a
r
t7800:
"d
e
faults" is no longer a builtin
t
ool
n
ame
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David
Aguilar
t7800: modernize tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
D
avid
A
guil
a
r
t7800: up
d
a
te copyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
Davi
d
A
g
u
ilar
d
ifftool: silence
u
nin
i
tialized
variable w
a
rning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix
pri
n
tf usa
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
difftool-
-
helper:
f
ix p
r
intf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Ag
u
ilar
doc: gene
r
a
t
e a
l
ist o
f
vali
d
merg
e
tool
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Agu
i
lar
m
ergetool--
l
ib: add functio
n
s for finding a
v
ai
l
able
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vi
d
Aguilar
mer
g
etool
-
-lib: i
m
prove the hel
p
text in guess_
m
erge_to
o
l()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merge
t
ool--lib: simpl
i
fy command exp
r
essi
o
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
Ag
u
ila
r
mergetools:
s
impl
i
fy
h
ow we h
a
ndle "vim" and "d
e
faults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguila
r
mer
g
etool--lib: imp
r
ove sho
w
_
t
ool_help()
o
utput
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
A
g
u
ilar
mergetools/vim: r
e
move
r
edu
n
dant d
i
ff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David
A
gui
l
ar
m
ergetools/p4merg
e
: H
o
nor $
T
M
P
DIR for the
/
dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
m
e
r
getools/p4merge: Handle "
/
dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetoo
l
--lib: Allow custom commands to override built-i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
g
itk: Rename 'ta
g
co
n
tents' t
o
'cached_tagcon
t
ent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
gitk: Teach "Reread references
"
to rel
o
ad tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,difftool: Documen
t
--tool-help consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Ag
u
il
a
r
di
f
ftool: Disa
b
l
e
--symli
n
ks on
cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d
Aguilar
d
i
fftool: Handle
c
ompare()
return
i
ng -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difftool: Wrap long l
i
nes for reada
b
il
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
uilar
d
i
f
f
t
ool: Che
c
k all return codes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguila
r
difft
o
ol
:
Ha
n
dle finding mergetools/ in a path wit
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Agu
i
lar
d
i
fftool:
U
se symlinks when diffi
n
g ag
a
inst
t
h
e w
o
rktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
av
i
d Aguilar
difftool
:
C
a
l
l the t
e
mp direc
t
ory "git-diffto
o
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Move option
v
alues
i
nto a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
di
f
ftool: Elimina
t
e global
variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid
A
guilar
difftool:
S
i
mplify print_tool_h
e
lp()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
a
vid Aguilar
t
7800: Test di
f
ftool passing arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool:
Prov
i
de an empty
file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David
A
guilar
M
akefile: Im
p
rove comp
i
l
e
r header dependency chec
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Ag
u
ilar
merge
t
o
ols/meld: Use '--output' when
avai
l
able
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uila
r
mergetoo
l
-
-
lib: Refactor t
o
o
l
s into se
p
arate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Ag
u
ilar
merge
t
ool--lib: M
a
ke style co
n
siste
n
t with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
u
il
a
r
d
i
fftool-
-
he
l
per: M
a
ke st
y
le consistent
w
ith g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Davi
d
Aguilar
t/t7503-p
r
e
-
comm
i
t
-
hook
.
sh:
Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
g
i
t
-
mergetool--lib: Make vimdiff
ret
a
i
n
the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remo
v
e
han
d
ling for GI
T
_PRE
F
I
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
s
e
tup: Provide
G
IT_PREFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
id Aguilar
s
u
bmodule s
y
nc: Upda
t
e "submodule
.
<
n
ame>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguila
r
mer
g
etool:
S
kip autores
o
lved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Ag
u
il
a
r
Documentation: Explain git-mergetool's use o
f
temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d Aguilar
Makefile: Remove usag
e
of deprecated Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next