repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetools: add support for smerge (Sublime Merge)
2019-04-04
David Aguilar
merge
t
ools: ad
d
s
u
p
port
f
o
r s
m
erge
(Sublim
e
Merge)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2017-06-19
David Aguilar
mergeto
o
ls
/
meld: improve co
m
pati
b
iilty w
i
th Mel
d
o
n
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2017-03-15
Dav
i
d Aguilar
difftool: handle mod
i
fied sy
m
lin
k
s
in
d
i
r-diff
m
o
d
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2017-03-15
D
a
vid Aguilar
t7800:
c
leanup cruft left
behind by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2017-03-15
D
av
i
d A
g
uilar
t7800: re
m
ove white
s
pace befo
r
e r
e
direct
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-08
David Aguilar
t7800
:
r
e
place "wc -l" with
t
est_line_c
o
unt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-08
David
A
guilar
t
780
0
:
s
implify
basic us
a
ge t
e
st
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2017-02-06
David Aguilar
difftool: fi
x
bug when pr
i
nting usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2017-01-18
David Aguilar
git
k
: Remo
v
e t
r
anslat
e
d message from c
o
mm
e
nts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-12-12
David Agui
l
ar
mergetools:
f
ix xxdif
f
hotk
e
y
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-12-12
Da
v
id Agu
i
lar
diff
t
ool: rename variabl
e
s for con
s
i
ste
n
c
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftoo
l
: chdir
as ea
r
ly as possibl
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-12-12
David Aguila
r
di
f
ftool:
s
aniti
z
e $workdir
a
s
early as possi
b
le
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-12-12
David Aguila
r
d
i
ff
t
ool: fix dir-diff index creation wh
e
n
i
n a sub
d
ire
c
tory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-12-08
David Aguilar
d
i
fft
o
o
l: fix d
i
r-diff i
n
d
ex
cr
e
ation whe
n
in a subdirectory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-11-29
Dav
i
d Ag
u
ilar
mer
g
et
o
o
ls/vimdiff: trust Vim's exit
code
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-11-29
D
a
vid A
g
uila
r
me
r
ge
t
ool: hono
r
mergetool
.
$tool
.
trustExitCode for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-10-11
David
Aguilar
me
r
g
etool: hon
o
r -O<orde
r
fil
e
>
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mer
g
etoo
l
:
honor diff
.
orde
r
Fil
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetool: move mai
n
progr
a
m
f
l
o
w int
o
a main() functio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mer
g
etoo
l
: add copyright
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difftool: use Git::* functions instead of passing ar
o
und
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
David
Aguilar
difftool: avoid
$GI
T
_DIR an
d
$GIT_WORK_TREE
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
Aguilar
subtree: adjust
funct
i
on de
f
initions to
match CodingGuidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
Da
v
id Aguilar
su
b
tree: adjust st
y
le
t
o
ma
t
ch C
o
di
n
gGuide
l
ines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-26
David
Ag
u
ilar
subt
r
ee: fix "git su
b
tre
e
split --rejoin"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
t7
9
0
0-subtre
e
.
sh: fix quoting and
broken && chains
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: handle unmerged fi
l
es in dir-di
f
f m
o
de
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-05-16
Davi
d
A
guilar
d
ifftoo
l
: initialize variables for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-03-10
David
A
guilar
mergetool: honor tempfile configur
a
t
i
on whe
n
resolving
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-03-10
David Agui
l
a
r
mergeto
o
l:
s
upport delete/delete confl
i
ct
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-10-29
D
a
v
id Aguilar
d
ifft
o
ol: ignore symbo
l
ic links in u
s
e_wt_file
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-23
D
a
vid Aguila
r
contrib/subtree: ignore log
.
date configuration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mergetool
s
: add winmerge
a
s a builtin t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-20
D
a
vi
d
A
g
u
i
l
ar
mergetool--
l
ib: set I
F
S for difftool and
m
e
rgetool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Aguil
a
r
merg
e
tools: stop settin
g
$status in merge_cm
d
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Aguila
r
m
e
r
g
etool
:
sim
p
l
i
fy
conditionals
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id Aguila
r
difft
o
ol--helper: add explicit exit stat
e
m
ent
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mer
g
etool--lib: remove use
o
f $
s
tatu
s
glo
b
al
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-14
Davi
d
Aguilar
difftool
:
honor --trust-ex
i
t-code for builtin tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
difftool
:
add supp
o
rt for
--trust-exit-code
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
t7610
-
mergetool: add test ca
s
es fo
r
mergeto
o
l
.
writeToTe
m
p
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
m
e
rgetool: add
a
n option fo
r
writing
t
o
a temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
merg
e
t
ool:
use more conservative tempora
r
y filenames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
te
s
t-
l
ib-functi
o
ns: adj
u
st
s
t
y
l
e
to match CodingGuideline
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
t
7
6
1
0-mer
g
e
tool
:
u
s
e
test_co
n
f
i
g to isolate
te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
A
g
uilar
mergetools/meld: make usage o
f
`
-
-output` conf
i
gurable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-sh-setup: move
G
IT_DIR
initialization into
a
fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d
Ag
u
ilar
mergetoo
l
: use more conservative t
e
mporary fil
e
n
ames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-l
i
b
-
f
u
n
c
tions: adjust style
t
o match CodingGuide
l
ines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7
6
10-mer
g
etool: prefer test_
c
onfig
over git config
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7610-
m
ergetoo
l
: add mi
s
sing && a
n
d
remove
c
omme
n
ted
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
av
i
d Aguil
a
r
t7610-mergetool: use tabs instead of a mix of tabs
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-07
Da
v
id Agui
l
ar
comple
t
ion: add --show-sign
a
ture for log and
show
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
Dav
i
d Aguilar
s
t
ash: pref
e
r --quiet over shel
l
redirection
o
f t
h
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Aguil
a
r
refs:
m
ake rev-parse --
q
u
i
et actua
l
ly quiet
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-16
David A
g
uilar
t15
0
3
:
u
s
e
test_mus
t
_be_empty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid Aguilar
Doc
u
m
entat
i
on: a no
t
e a
b
out stdout for git rev-pa
r
se
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d
A
g
u
ilar
cleanups: ensure
that git-c
o
m
p
a
t-util
.
h is included
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
style
f
ix: ast
e
risks stick to the variable, n
o
t the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
Dav
i
d Aguilar
gitk: Catc
h
mkdtemp err
o
r
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id Agu
i
lar
gitk:
Us
e
mktemp -d to
avoid pr
e
dictable
t
emporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Honor
T
MP
D
IR
w
hen viewin
g
external diffs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David Ag
u
ilar
difftool: support
r
eposi
t
ori
e
s
with
.
gi
t
-files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d
A
gu
i
lar
pull: add --
f
f-only to the help
text
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Davi
d
Aguil
a
r
pull: add pull
.
ff c
o
nf
i
gura
t
i
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
Da
v
id Aguilar
imap-send: eliminate HMAC deprecation wa
r
nings on Ma
c
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
c
ache
.
h: eliminate SHA-1
d
eprec
a
tion warnin
g
s on
M
ac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Agui
l
ar
M
a
k
efile: add suppor
t
for Appl
e
CommonCrypto
f
acility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
Davi
d
Aguilar
Makefile:
f
ix default reg
e
x sett
i
ngs on Darwi
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergeto
o
ls/kd
i
ff3: do not use --
a
uto wh
e
n diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
he
l
p
.
c: add a compatibility commen
t
t
o cmd_
v
ersion()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
co
n
trib/mw-to-
g
it/t
/
install
-
wiki
.
s
h: use a lower
c
ase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguil
a
r
con
t
rib/examples/git-remote
.
p
e
rl: use a
l
o
w
e
rcase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguil
a
r
tests
:
us
e
a low
e
rcase "
u
sage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
g
i
t-svn: u
s
e
a
lo
w
ercase "u
s
age:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguil
a
r
Documentatio
n
/
u
se
r
-man
u
a
l
.
tx
t
: use
a l
o
wercase
"
us
a
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
te
m
plates/ho
o
k
s--
u
pdat
e
.
s
a
mple: use a
lowercas
e
"
u
sag
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agu
i
lar
c
o
ntrib/hooks/setgitperms
.
perl: use a lowerc
a
se "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d A
g
u
ilar
contrib/example
s
: us
e
a l
o
w
ercase "usag
e
:
"
stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguil
a
r
contrib
/
fast-
i
m
port/i
m
po
r
t-zips
.
py: use spaces
i
nstead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contr
i
b
/
fast-impo
r
t
/impo
r
t
-
z
i
ps
.
py: fix broken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
contrib/fast-imp
o
rt:
u
s
e a lowercase "usage:"
s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Aguila
r
con
t
r
ib/c
r
e
de
n
tia
l
: us
e
a
l
ower
c
ase "usage:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
guilar
git-cvsimport:
use
a
lo
w
ercas
e
"
u
s
age:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvs
i
mport: us
e
a lowercase "usag
e
:
" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguilar
git
-
cv
s
exp
o
r
tco
m
mit:
u
s
e a lo
w
ercase "u
s
age:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t
-archimport:
use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
g
i
t-merg
e
-one-
f
ile:
use a lowercas
e
"usag
e
:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-reli
n
k: us
e
a lowercase "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-svn: use a lowercase "u
s
age:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d
Aguilar
git
-
sh
-
s
etup: use a lowerc
a
se "usage
:
" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
u
i
l
ar
t7800:
"defau
l
ts"
i
s no l
o
nger
a
b
uiltin tool name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d
A
guil
a
r
t7800: mode
r
nize tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: update copyr
i
ght noti
c
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
D
avid Aguila
r
difftool:
silence uninit
i
ali
z
ed variab
l
e
w
a
rnin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguila
r
p4mer
g
e
:
fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguilar
dif
f
t
o
ol--helper: f
i
x
printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Agu
i
lar
doc: g
e
ne
r
ate
a
l
ist of valid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Agui
l
ar
m
ergetool--lib: add
f
unction
s
for find
i
n
g
available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next