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: fix bug when printing usage
2017-02-06
David Aguilar
difftool: fix bu
g
when printi
n
g usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
ergeto
o
l: hono
r
-
O
<orde
r
fil
e
>
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetool: ho
n
or
d
i
f
f
.
orderFil
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-10-11
David
Aguila
r
mergetool: move main progra
m
fl
o
w int
o
a main() fu
n
ctio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetoo
l
: add
c
opyright
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difftool: us
e
Git::* functio
n
s instead
of p
a
s
s
ing
a
roun
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
Da
v
id Aguilar
difftool: avoid $GIT_DIR an
d
$GIT_WORK_TREE
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
David A
g
uilar
s
u
bt
r
ee: a
d
just function defin
i
tions to match Co
d
i
n
gGuidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d Aguilar
subtree: adj
u
st
sty
l
e to match CodingGui
d
e
lines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-26
David Aguila
r
s
u
btree: fix "git subtree split --rej
o
in"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
t7
9
0
0
-subtree
.
sh: fix qu
o
t
ing and broke
n
&& c
h
ains
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
di
f
ftool: handle unmerged fi
l
es in dir-
d
iff mode
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-05-16
Da
v
id
A
gu
i
lar
difftoo
l
: initialize vari
a
b
les for readab
i
lity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-03-10
Dav
i
d
A
guilar
mergetool:
honor
te
m
pfile co
n
f
iguration when resolving
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-03-10
David Agui
l
a
r
mergetool:
support delete/delete confli
c
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-10-29
Davi
d
Agui
l
ar
difftool:
i
gnore symboli
c
lin
k
s in
use_wt_file
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-23
Dav
i
d Aguilar
co
n
trib/sub
t
ree: ignore log
.
date configura
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-20
Dav
i
d Aguilar
merg
e
tools: a
d
d winmer
g
e as
a
b
u
il
t
i
n tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-20
Dav
i
d
A
guilar
mer
g
etool--lib
:
set
I
FS f
o
r difftool a
n
d mergetool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Agu
i
la
r
mergetoo
l
s: stop sett
i
ng $status i
n
merge_cmd()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
D
avid Aguila
r
m
ergetool: simplify
c
ondit
i
onal
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
di
f
ftool--h
e
lper: add exp
l
icit ex
i
t statement
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool--lib: re
m
ove
u
s
e of $statu
s
gl
o
b
al
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-14
David Aguila
r
difftool: ho
n
or --tr
u
s
t
-exit-code f
o
r
b
uiltin tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-28
Da
v
i
d Agu
i
lar
difftool: add support for
-
-trust-ex
i
t-code
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool: ad
d
test
ca
s
es fo
r
mergetool
.
writeToT
e
mp
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
merg
e
tool: add an option
f
or writ
i
ng to a temp
o
rary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
merg
e
tool: use
m
o
re conservative
t
emp
o
r
a
r
y f
i
lenames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uil
a
r
test-lib
-
functions:
adjust style to match CodingGui
d
elines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
A
g
uilar
t7610-mergetool: use test_
c
o
n
fig t
o
isola
t
e tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetools/meld: make
u
s
a
ge of `-
-
output` c
o
nfigurable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
g
it-sh-set
u
p: m
o
v
e GIT_DIR
in
i
t
ialization into a function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
mergeto
o
l
:
use
mo
r
e
conservative temporary filename
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
test-li
b
-functions:
adj
u
st style to m
a
tch Cod
i
ngGuidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
t761
0
-mergeto
o
l: p
r
efer
test_config
over git config
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
t
7610-merge
t
ool: add miss
i
ng && and
r
em
o
ve commented
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d A
g
uilar
t76
1
0-mergeto
o
l: use tabs instead
o
f a
m
i
x of tab
s
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-07
David Agu
i
lar
completion: add --show-sig
n
atu
r
e
for
log
and show
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
David
A
guilar
s
tash: pre
f
er --q
u
i
e
t over she
l
l redirection of the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Agu
i
lar
refs
:
ma
k
e r
e
v-parse
--quiet actually q
u
i
e
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-16
David Ag
u
ilar
t1503: use tes
t
_mu
s
t_b
e
_empt
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d
A
g
u
ilar
Docume
n
tation: a note
about stdo
u
t for git rev-parse
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
David Ag
u
ilar
c
leanups: ensure that git-
c
ompa
t
-u
t
i
l
.
h is in
c
lu
d
ed
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
stylefix:
a
steris
k
s stick to the variable, not the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gitk: Catc
h
mkd
t
em
p
errors
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David A
g
uilar
g
i
tk:
Us
e
mktemp -d to
a
void pred
i
ctabl
e
temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid Agui
l
ar
gitk: Honor TMP
D
IR wh
e
n viewing externa
l
diffs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
Da
v
id Agui
l
ar
dif
f
t
o
o
l
: su
p
p
ort reposit
o
r
i
e
s
with
.
git
-
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Agu
i
lar
pull: a
d
d
-
-ff-only to the help
t
ext
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: a
d
d pu
l
l
.
ff config
u
ration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vid Aguilar
i
m
ap-sen
d
: eliminate HMAC deprecatio
n
warnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
id
A
guilar
cache
.
h: eliminate SHA-1
d
epr
e
cation warnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David A
g
uilar
M
akefile: add
s
upport fo
r
Apple CommonCrypto facili
t
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
David
Aguilar
Makef
i
le:
f
ix default regex settings
o
n Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
Da
v
id Aguilar
m
e
rgetools/kdif
f
3: do not use --auto wh
e
n diff
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
Davi
d
Aguila
r
help
.
c: a
d
d a compatibility comment to
c
md_ver
s
ion()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
c
o
ntrib/
m
w-to-git/t/install-wiki
.
sh: use a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
c
ontri
b
/ex
a
mples/git-
r
em
o
t
e
.
perl: use a low
e
r
case
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
t
e
sts: us
e
a lowercase "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
git-svn: use a lowerc
a
se "us
a
ge:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
D
ocu
m
en
t
ation/u
s
er-manual
.
txt: use a
l
owercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
templates/hooks--up
d
ate
.
sample: use a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
ui
l
ar
contrib/hooks
/
s
etgitper
m
s
.
perl: use a lowercase
"
usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
contrib/example
s
:
u
s
e a lowercase
"
usage:
"
strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
g
u
i
l
ar
contrib/fast-import/im
p
ort-zips
.
py: use spaces instea
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Ag
u
ilar
contrib/fa
s
t-impo
r
t/import
-
zips
.
py: fix bro
k
en
error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
uil
a
r
contrib/fast-import: use a lowercas
e
"
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
ib/creden
t
ial: use a
lowerc
a
se "u
s
age
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-c
v
simpo
r
t: u
s
e a lowercase "usage:"
s
trin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agui
l
a
r
git-cv
s
import: use a low
e
r
c
ase "usag
e
:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
git-cvs
e
xpo
r
t
commit:
use a
l
o
wercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-arch
i
mp
o
rt: us
e
a lower
c
ase "usag
e
:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid A
g
uilar
git-merge-one-file: use a l
o
wercase "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 Agu
i
lar
git-relink: use
a lowe
r
ca
s
e "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
guilar
gi
t
-svn: use a
lowercase
"us
a
ge
:
" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
g
i
t-sh-setup:
u
se
a
lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David
A
guilar
t780
0
:
"
d
e
faults" is
no longer a built
i
n
too
l
name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
D
avid Aguilar
t
78
0
0:
m
o
d
ernize
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: upd
a
te co
p
y
r
ight notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David
Agui
l
ar
d
i
fftool: silence uninit
i
a
lize
d
v
ariab
l
e warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id Agui
l
ar
p4
m
erge
:
fix
p
r
i
n
t
f usa
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
ui
l
ar
d
i
fftool--helper: fix
p
rint
f
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: gene
r
ate a list of
v
alid mer
g
e t
o
o
l
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib
:
add funct
i
ons for find
i
ng a
v
ailable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Agu
i
lar
m
ergetool--lib: improv
e
the help
t
ext in gues
s
_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
merg
e
tool--lib
:
simplify command
e
xpre
s
s
i
o
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Agui
l
ar
mergetools: s
i
mp
l
ify how we han
d
le
"vim
"
a
n
d "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguil
a
r
mergetool--lib
:
improve sh
o
w_tool_help() outp
u
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
mergetool
s
/vim: remove
redunda
n
t diff com
m
a
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
avid Aguil
a
r
mergetools/p
4
merge: Honor $TMPDIR f
o
r
the
/
dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Davi
d
Ag
u
ila
r
m
e
rgetools/p4merge: H
a
ndle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguil
a
r
m
e
rgetool-
-
lib: Allow custom co
m
mands to
override built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id Aguilar
g
it
k
:
R
ename 'tagcontents
'
t
o
'
c
ached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d 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 Aguil
a
r
mergetool,difftool: Document
-
-
t
ool
-
h
e
lp consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
difftool
:
D
i
s
a
ble --syml
i
n
ks
o
n
cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
ifftool: Handle compa
r
e() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
diffto
o
l: Wrap long line
s
f
or r
e
adab
i
lity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Check all return co
d
es
from c
o
mpare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Handle finding
mergetoo
l
s/ in a pat
h
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next