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--helper: add explicit exit statement
2014-11-21
D
av
i
d Aguilar
d
i
ff
t
o
ol--he
l
per:
a
dd ex
p
l
icit e
x
it statement
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Agu
i
lar
mergetool
-
-lib: remo
v
e
use of $
s
tatus
global
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
d
ifftool: honor --trust-exit-c
o
de for builtin
tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-28
David Ag
u
ilar
d
ifftool:
a
dd support for --tru
s
t-
e
xit-
c
o
d
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool: add test cases for mergetool
.
writeToTemp
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Ag
u
ilar
merget
o
ol: add an option for w
r
i
t
ing to a temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
merget
o
ol:
u
se more
c
onserv
a
tive temporary filenames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
test-
l
i
b
-
func
t
ions: adjust
s
t
yle to match CodingGuidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
a
r
t7610-mergeto
o
l: use te
s
t_c
o
nfig
t
o
isolate tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
m
e
rgetools/meld: make usage of `--output`
configurabl
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguila
r
git-sh-setup: move G
I
T_DIR
initiali
z
ation into
a functi
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
merge
t
ool: use
mo
r
e
c
o
n
servative temporary fil
e
nam
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vi
d
A
guilar
test-li
b
-func
t
ion
s
:
adjust style
t
o match CodingG
u
idel
i
nes
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid
A
guilar
t
7610-
m
erg
e
tool:
p
refer test_confi
g
o
v
er git conf
i
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t7610-merge
t
ool:
a
dd m
i
ssing
&
&
and
re
m
ove c
o
mm
e
nted
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
t761
0
-m
e
r
get
o
ol:
use tabs
i
nstead of a mix of tabs
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
comp
l
e
tion: add --show-signa
t
ure for log and s
h
ow
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
s
tash: prefer --quiet ove
r
she
l
l re
d
irection of th
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
r
e
fs: ma
k
e rev-
p
arse
-
-
quiet
a
ctually
quiet
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503: use test_must_be_empty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d Aguilar
Documen
t
ation:
a note ab
o
ut stdout
f
or git r
e
v-pa
r
se
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
David
A
guilar
c
l
eanups:
e
ns
u
re that git-compat-util
.
h
i
s
in
c
luded
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
styl
e
fix: aster
i
s
k
s stick
t
o
t
he var
i
ab
l
e, not th
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
D
a
vid Aguilar
gitk:
C
atch mk
d
temp errors
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Agu
i
lar
g
i
tk:
Use
m
ktem
p
-d t
o
avoid pred
i
ctabl
e
temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk
:
Honor TMPDIR wh
e
n viewin
g
e
xternal diffs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David
Agui
l
a
r
d
ifftool: support
repositories w
i
t
h
.
g
it
-
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d A
g
uilar
pul
l
: a
d
d -
-
ff-only to the help
t
e
x
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: a
d
d pull
.
ff configuration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
D
a
v
id Ag
u
ilar
imap-send: elimina
t
e HMAC deprecation warnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h: eliminat
e
SHA-1 deprecation warnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Ma
k
efile: add support for Apple Comm
o
nCry
p
t
o faci
l
ity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
D
a
vid Agu
i
lar
M
a
kef
i
le: f
i
x defau
l
t regex settings on Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Ag
u
ila
r
m
e
rgetools/k
d
iff3: d
o
not use
-
-
auto when dif
f
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David
A
guilar
help
.
c: a
d
d
a compatib
i
lity comment to
cm
d
_ver
s
ion()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
contrib
/
mw-to-git/t/in
s
tall-w
i
ki
.
sh: use a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguilar
contrib/exa
m
ples/git-re
m
o
t
e
.
perl: use
a
lowerca
s
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Ag
u
il
a
r
test
s
: use a lowerc
a
se
"
us
a
ge
:
"
st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
git
-
s
v
n
: use a low
e
rcas
e
"usag
e
:
"
stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
l
a
r
Documentatio
n
/use
r
-man
u
al
.
txt: use a l
o
wer
c
ase "us
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
temp
l
at
e
s
/hooks-
-
update
.
sample:
u
s
e
a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d
Agu
i
lar
c
o
ntrib/hoo
k
s
/
setgitperms
.
p
e
r
l: use a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
ib/exampl
e
s: use a lowercas
e
"us
a
g
e:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/
f
ast-import/import-zips
.
p
y
:
u
se spa
c
es instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
i
lar
contrib/fast-import/im
p
ort-zi
p
s
.
py: fix broken err
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
c
ontrib/fast-import: use a l
o
w
ercase "usage:
"
s
t
rin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contrib/credential: use a lowerc
a
se "usa
g
e
:
" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguila
r
gi
t
-cvsimport: us
e
a
lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
git-cvsi
m
p
or
t
: use a
l
owe
r
c
ase "usage:" s
t
r
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t
-cvsex
p
ort
c
ommi
t
: use a lower
c
ase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archimport
:
use a lowercase "usage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-merge-o
n
e-file: use a low
e
rcase
"
usage:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-r
e
link:
use
a
lowercas
e
"usage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git
-
s
vn: use a lowercase "
u
sag
e
:
"
str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-sh-set
u
p
:
us
e
a
lo
w
ercase "usag
e
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David
A
guila
r
t7800:
"d
e
fault
s
" is no l
o
nger
a
builtin
t
ool name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid
A
gu
i
lar
t7800: modernize test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Aguila
r
t
780
0
: update copyrig
h
t notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: silenc
e
uninitialized
v
ariable warni
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguil
a
r
p4merg
e
:
fix pri
n
tf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Agu
i
lar
difftoo
l
-
-
h
elper: fix
p
r
i
n
t
f usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d Aguilar
doc: gene
r
ate a
l
ist of valid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guilar
mer
g
etool--l
i
b: add functions
f
or finding
a
vailable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Agu
i
lar
m
e
rgetool--lib: improve
the hel
p
text
i
n gue
s
s_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
m
e
rget
o
ol--lib
:
simplify command
expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguilar
mergetoo
l
s: simplify how we
handle "vim" and "defa
u
lts"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
merge
t
o
o
l
--lib: improve sho
w
_
tool_help(
)
output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Agu
i
lar
merge
t
ools/vim: remo
v
e redundant d
i
ff com
m
an
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
a
v
id
A
guil
a
r
m
e
rgeto
o
ls/
p
4merge: Honor $TMPDIR for
the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguila
r
m
ergeto
o
ls/p4merge: Handle "/
d
ev/nu
l
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--lib: Allo
w
custom commands to override
b
ui
l
t-i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
gitk: Rename '
t
agcontents' to 'cac
h
e
d
_
t
agcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
A
guila
r
gitk: Te
a
c
h "R
e
rea
d
reference
s
" to reloa
d
ta
g
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguila
r
mergetool,difftool: Document --too
l
-h
e
l
p consist
e
ntly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disable --symlinks on
cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
fft
o
ol: Handl
e
compare(
)
r
eturning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difft
o
ol: Wrap long lin
e
s for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Agui
l
ar
difft
o
ol: Check all return c
o
des from c
o
mpare(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
d
i
ffto
o
l: Handle finding mergetools/
in a path
w
ith
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
diff
t
ool: Use symlinks when di
f
fing aga
i
ns
t
the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difftool
:
Ca
l
l the temp direct
o
r
y
"gi
t
-di
f
ftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguil
a
r
difft
o
ol: Move
opti
o
n
v
alu
e
s
into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Elimin
a
t
e
glo
b
a
l variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
d
if
f
t
ool: Simplify print_too
l
_hel
p
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Tes
t
diffto
o
l
passing argu
m
ents to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
Da
v
id Agu
i
l
ar
merge
t
ool:
Pr
o
vide an empty fi
l
e when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
a
vid Aguilar
Makefile: Improve compil
e
r heade
r
dependency
c
heck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
mergetools
/
m
eld: U
s
e '--output' whe
n
ava
i
l
able
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
mergetool--lib: Re
f
actor to
o
ls into sep
a
rate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
m
erget
o
ol--lib: Ma
k
e
s
tyle consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
d
iffto
o
l-
-
helper:
Make
styl
e
consistent
wi
t
h git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t75
0
3
-
pre-commit-hook
.
sh
:
Add GIT_PR
E
FIX te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
git-mergeto
o
l--l
i
b: Make vimdiff retain the c
u
rrent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Agu
i
lar
git: Remove handling fo
r
GIT_P
R
EFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
setup: Provide GI
T
_PREFIX to built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
i
d
Aguilar
sub
m
odul
e
s
y
n
c: U
p
date
"
subm
o
dule
.
<
n
ame
>
.
url
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
v
id
A
g
u
ilar
me
r
ge
t
ool: Skip autoresolve
d
pa
t
h
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Documentation: Explain git
-
m
erge
t
oo
l
's use of te
m
po
r
ary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d Aguilar
Makefile: Remove usage of depr
e
cated Py
t
hon "has
_
key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
Aguilar
di
f
ftool: Fix
'
--gui'
w
he
n
di
f
f
.
guit
o
ol is unconfigure
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next