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
difftool: honor --trust-exit-code for builtin tools
2014-11-14
D
a
v
id Aguilar
difftool: honor
--
t
rust-exit-code for builti
n
to
o
ls
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-28
D
a
vid Agui
l
ar
dif
f
tool: add support fo
r
-
-trust
-
exit
-
code
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
Dav
i
d Aguilar
gitk: Catch mkdtemp
e
r
rors
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: U
s
e mkt
e
mp
-
d to avoid predic
t
able
t
emporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Aguil
a
r
gitk: Honor TMPDIR when viewing
e
x
ternal dif
f
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
Da
v
id Aguilar
dif
f
tool: suppo
r
t reposi
t
ories with
.
git-f
i
les
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d Aguila
r
p
ull:
a
dd --ff-only to t
h
e h
e
lp text
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Agu
i
lar
pull: add pul
l
.
ff configur
a
t
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
D
avid Aguilar
imap-se
n
d
: eliminate HMAC depr
e
c
at
i
on warning
s
on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d
Aguilar
cache
.
h
:
elimina
t
e
SHA-1 deprecation wa
r
nings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Ag
u
ilar
M
akefile: add support
for Apple Common
C
r
ypto faci
l
ity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
David
A
guilar
Make
f
ile: fi
x
default regex s
e
ttings o
n
Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
Davi
d
Aguilar
mergetoo
l
s/kdiff3: do not use --auto when d
i
ffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David A
g
uilar
he
l
p
.
c: add a compatibi
l
i
t
y comm
e
nt 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
.
s
h
:
u
se
a lowercas
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/examples/git-r
e
mote
.
perl: use a
lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Ag
u
i
lar
tests: use a l
o
w
e
rcase "usa
g
e:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Ag
u
ilar
git-svn: use a lowercase "u
s
age:
"
s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
Documentation/user-m
a
nual
.
txt: use a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
tem
p
lates/hooks-
-
update
.
sample: use
a
lowerca
s
e "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
c
ontrib/hooks/setgitper
m
s
.
p
erl:
use
a lowercas
e
"
u
s
age
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguil
a
r
contrib/exampl
e
s: use
a
lowercas
e
"
usage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-import/import-
z
ips
.
py: u
s
e s
p
aces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Aguilar
contrib/
f
ast-import/import
-
zips
.
py
:
fi
x
broken err
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
co
n
tri
b
/fast-
i
mport: use a
lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gu
i
l
a
r
contrib
/
c
red
e
ntial: us
e
a lowercas
e
"us
a
ge:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsimport: use
a low
e
rcase "usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
cvsimport: use a l
o
werca
s
e
"usag
e
:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Aguilar
git-cvsexportco
m
mit
:
use a lowercase "u
s
a
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-archimport: use
a
l
o
werca
s
e "usage:
"
s
tr
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-
m
erge-one-file:
u
se a lowercase "usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-relink: use
a low
e
rcas
e
"usage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
l
a
r
git-svn: use a lo
w
er
c
ase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Ag
u
ilar
g
it
-
s
h
-setup:
u
se a lo
w
ercase "usage:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David
Agui
l
ar
t
7
800: "defaults" is n
o
longer a builtin tool nam
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid Aguilar
t7800
:
moder
n
ize tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Aguila
r
t
7
800: update copyright
n
ot
i
c
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
Da
v
i
d Ag
u
ilar
difftool:
s
i
l
en
c
e uninitialized var
i
able war
n
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
id Agui
l
ar
p4merge: fix pri
n
tf usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
difftool--helper: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: gen
e
rate a list o
f
valid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
v
id Agui
l
ar
mer
g
etool--lib: a
d
d functions for
finding ava
i
l
a
b
le
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
m
erget
o
ol--lib: i
m
pr
o
ve the help text in
g
uess_merge_too
l
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
avid
A
gui
l
ar
merg
e
t
ool--lib: simpl
i
fy comman
d
ex
p
ression
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid
A
guilar
mergetools: si
m
p
l
i
f
y h
o
w w
e
handle "vim"
a
nd "d
e
fau
l
ts"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
lar
m
ergetool--lib: improve show_tool_he
l
p()
outp
u
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
merge
t
ools/vim: remov
e
redundant di
f
f command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Agu
i
lar
m
e
rgetools/p4
m
er
g
e:
Honor $TMPDIR for the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
me
r
g
e
tools/p4merge: Han
d
le "/d
e
v/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David
Ag
u
i
l
ar
merge
t
ool--lib: All
o
w custo
m
comma
n
ds t
o
ov
e
rride buil
t
-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rename 'tagcontents' t
o
'cached
_
tagcont
e
nt'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avi
d
A
g
uilar
gitk:
T
each "Reread references" to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Agui
l
a
r
m
ergetool,difftool: Document --tool-help co
n
sistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguilar
d
i
ff
t
o
o
l: Dis
a
ble -
-
s
y
mlinks on cy
g
win
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Ag
u
il
a
r
difftool: Handle compare()
ret
u
rning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d
Aguilar
diffto
o
l: Wrap long lines for r
e
adab
i
lity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
diffto
o
l:
C
heck all ret
u
r
n codes fr
o
m compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool:
H
and
l
e
finding mergeto
o
ls/
i
n a p
a
th with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d Agui
l
ar
diffto
o
l: Use symlink
s
when diff
i
ng against the
w
o
r
kt
r
e
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Call t
h
e te
m
p directo
r
y "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fftool: Move option values into a
hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguil
a
r
difftoo
l
: Elimin
a
te global varia
b
les
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
difftool: Simplify pr
i
nt_tool_
h
e
l
p()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t
7800: Test
difftool pass
i
ng arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
m
ergetool:
Provid
e
an empty
f
ile when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
M
ake
f
ile: Improve
c
ompiler h
e
ader dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
mergeto
o
ls/meld: Use '--o
u
tp
u
t' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guila
r
me
r
get
o
ol--lib: Refac
t
or tools into separ
a
t
e
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
ergetool--lib: Make
style con
s
ist
e
nt wit
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
d
ifftool
-
-helper: M
a
k
e
style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-co
m
m
i
t-hoo
k
.
s
h: A
d
d G
I
T
_
P
RE
F
IX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
g
u
ilar
git-mergetool--lib: Make vimdi
f
f
r
etain
t
h
e
c
u
r
rent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
i
d Aguilar
git: Rem
o
v
e handl
i
ng for GIT_
P
REF
I
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
setup: Provide GIT_
P
REFI
X
to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
sub
m
odule sync:
U
pdate "submodu
l
e
.
<
n
a
m
e
>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Sk
i
p au
t
oresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguila
r
Document
a
ti
o
n
:
E
x
p
l
ain git-mer
g
eto
o
l's use of
temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Aguilar
Makef
i
le:
Remove usag
e
of deprecated Pyth
o
n "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool:
Fix '
-
-gui' whe
n
diff
.
guitool i
s
u
n
configured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Agui
l
ar
t78
0
0-difftool
.
s
h
:
T
est me
r
getool
.
prompt f
a
llback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftoo
l
: Update copyright notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
difftool: Use ev
a
l to expand
'
--extcmd'
expres
s
ions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Add '-x' and as an ali
a
s for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
t7800-difft
o
ol
.
sh: Simpl
i
fy t
h
e --
e
xtcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
git-diff
.
txt:
L
ink to
g
i
t
-
difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
av
i
d Aguilar
difftool
:
Allow specifying
u
n
configured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difftool--helper: Remove u
s
e
o
f the G
I
T_MERGE_TOO
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid
Agu
i
lar
difftool
-
-
h
elper:
U
pdate copyright and remove distract
i
ng
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
gi
t
-difftool: Add '--gui' for
selecting a GUI too
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
i
l
ar
t7800-difft
o
ol: Set a bogus tool
for us
e
by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
Aguilar
help: Do not unnecessarily look
f
or a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David
A
g
uilar
subm
o
dule
.
c: Squelc
h
a "use before as
s
ign
m
ent" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
diff: generat
e
prett
y
filename
s
in p
r
ep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Agu
i
lar
compa
t
: add a b
a
sename() compa
t
ibili
t
y function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
compat:
add a
m
kstemps() com
p
atib
i
l
ity func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Ad
d
git-replace to
.
gitignor
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
a
v
i
d Agu
i
lar
mergetool--lib: add support fo
r
araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
Aguilar
m
ergetool--lib: specialize diff options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib:
s
implify API
usage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool/
m
e
rget
o
ol: refactor
commands to u
s
e git-
m
ergetoo
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next