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: avoid $GIT_DIR and $GIT_WORK_TREE
2016-07-28
David
A
g
u
ilar
difftool: avoid $GIT_DIR
a
n
d
$GIT_WO
R
K_T
R
EE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguil
a
r
difftool: ha
n
dle unmerged fi
l
es in d
i
r-
d
iff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difft
o
ol
:
initialize variables fo
r
r
eadability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
avid Aguilar
me
r
g
e
tool:
honor
t
e
mpfile configura
t
ion when re
s
olving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
merget
o
ol: support delete/delete confli
c
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
D
a
v
id Ag
u
i
lar
d
ifftoo
l
: ignore symbol
i
c links
in use_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
D
a
vid Aguilar
contrib/subtree: ignore log
.
date configura
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Agui
l
ar
mergetools:
a
dd winmerge as a builtin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David
A
guilar
mergetool--lib: set IFS
f
o
r diffto
o
l and mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id
Aguilar
m
e
r
getools
:
s
t
o
p se
t
t
ing $status
i
n merg
e
_cm
d
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
v
id Ag
u
i
lar
merg
e
tool:
s
implify
condi
t
ional
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
difftool--helpe
r
: add e
x
plicit exit
s
tatement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
gui
l
ar
m
e
rge
t
o
ol--lib: remove use of $status
globa
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
Dav
i
d Aguilar
difftool: honor --trust-exit-cod
e
f
o
r buil
t
i
n tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
difftoo
l
: add
support for --trus
t
-ex
i
t
-co
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610
-
m
e
rgetool: add test cases
fo
r
me
r
ge
t
oo
l
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
mergetool: add an
o
ption for writi
n
g to a t
e
mporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetoo
l
: use more conservative tempo
r
a
r
y fi
l
en
a
m
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
tes
t
-lib-fun
c
tio
n
s: adjust
s
tyle to matc
h
CodingGuideline
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
t7610-
m
er
g
etoo
l
: use t
e
st_con
f
ig to
i
solate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetools/mel
d
: make usage of `--out
p
ut` configura
b
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid
A
guilar
g
i
t-sh-s
e
tup: move GI
T
_DIR i
n
i
t
ialization into a fun
c
t
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
merg
e
tool: use m
o
r
e
conservative te
m
porary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-lib-funct
i
ons: adjust st
y
le t
o
match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
t7610-merget
o
ol: pref
e
r tes
t
_c
o
nfig over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t7610-merget
o
o
l
:
add missing &&
a
n
d
remove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
av
i
d
A
gui
l
ar
t76
1
0
-mergetool: use
t
abs instead of a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
c
ompletion:
add --show-signatu
r
e f
o
r log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Dav
i
d A
g
uilar
stash:
prefer
-
-
q
uiet over shell
redirectio
n
of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs: make rev-parse --quiet actually q
u
iet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguila
r
t1503: use test_must_be_emp
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Documentation: a note a
b
out
s
tdout for git rev-par
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Agui
l
a
r
cleanups: ensu
r
e that git-co
m
pat-util
.
h i
s
i
n
cluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Ag
u
ilar
stylefix
:
asterisks stick to the
v
a
r
iable, n
o
t
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Davi
d
Aguilar
gitk
:
Catc
h
m
k
dt
e
mp erro
r
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Davi
d
A
g
uil
a
r
gitk: Us
e
mktem
p
-d to
a
void predictable temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid
A
guilar
gitk: H
o
n
or TMPD
I
R
when viewing external
diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David
Aguila
r
difftool:
suppo
r
t rep
o
sitories with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avid Agui
l
ar
pul
l
: a
d
d
--ff-only to the
h
elp tex
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Agu
i
lar
pul
l
: add pull
.
f
f
c
o
nfiguration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-send: eliminate H
M
AC depreca
t
ion war
n
ings on M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Aguilar
c
ache
.
h: eliminate SHA-1 depr
e
cation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Ag
u
ilar
Ma
k
efi
l
e: add support for Ap
p
le CommonCry
p
to
f
acility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguil
a
r
Makefil
e
: fix d
e
fault r
e
g
e
x settings on
D
arwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Da
v
id Aguilar
m
ergetools/kdiff3: do n
o
t
u
se --a
u
to when diffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
A
guilar
h
e
lp
.
c
: add a compatibility comme
n
t to cmd_
v
e
rsion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/mw-
t
o
-
git/t/instal
l
-wiki
.
sh: use
a
lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id
A
g
uilar
contrib
/
examples/g
i
t-r
e
mote
.
perl: use a lower
c
as
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
tests: use a
lo
w
erc
a
se "us
a
ge:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
g
i
t-svn: use a lowercase
"
usage
:
" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Docume
n
tation/user-ma
n
u
a
l
.
t
xt: use a lo
w
ercase "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agui
l
ar
t
emplates/hooks--update
.
sample:
u
s
e
a lowerca
s
e "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contrib/h
o
oks/setgitperms
.
perl:
u
se a low
e
rcase
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
c
o
ntrib
/
e
x
amples:
u
s
e a lowe
r
case "
u
sage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contr
i
b/fast-impor
t
/impor
t
-zips
.
py: use spac
e
s
instea
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
contrib
/
fas
t
-import
/
im
p
o
r
t-
z
ips
.
py: fix
b
roken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/fast-impo
r
t:
use a low
e
rcase "u
s
age:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Ag
u
il
a
r
contrib/cred
e
ntial: use a
lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gu
i
lar
git-cvsimport: use a lowercase "
u
sage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
gi
t
-c
v
s
impor
t
:
use a lowerca
s
e "usage:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguilar
git-cvsexportcom
m
it:
use
a lower
c
ase "usage:
"
st
r
ing
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
A
gu
i
lar
g
it-merge-one-
f
ile:
use a
l
o
w
ercase "usa
g
e:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-r
e
link
:
use a lowercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-svn: use
a lowercas
e
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-sh-
s
etu
p
: use a
l
owercase "usag
e
:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: "defau
l
ts"
i
s no longer a b
u
i
l
ti
n
tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: mod
e
rnize t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
a
vid Ag
u
ilar
t
7
800
:
u
pdate copyright
not
i
ce
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguil
a
r
difftool: silence
unin
i
tia
l
ized
va
r
iable war
n
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
Aguilar
p4m
e
rge: fix
p
r
i
n
tf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool--helper: fix printf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
Aguil
a
r
doc: generate a list of valid merge too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguil
a
r
m
ergetool--lib: add fun
c
tions for finding ava
i
lable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid A
g
u
ilar
mergeto
o
l--lib: improve the help text i
n
guess_merge_too
l
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merget
o
ol--li
b
: si
m
pli
f
y
com
m
and exp
r
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merge
t
ools:
s
im
p
lify
how we handle "vim" and "defa
u
lts"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguil
a
r
me
r
getool--lib: improve sh
o
w_tool_help() ou
t
put
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uilar
mergetools/vim: remove redun
d
ant diff comm
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David
Aguilar
mergetools
/
p4merge: Honor $TMPDI
R
for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid
A
guilar
mergetools/p4merge: Handle "/dev/null
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d Aguilar
merge
t
o
o
l--
l
ib: Allow
c
ustom commands to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
g
i
tk: Renam
e
'tagcontents' to 'cache
d
_tagcontent
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid A
g
uila
r
g
itk: Teach
"Reread refe
r
en
c
es" to re
l
oad t
a
gs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d Aguil
a
r
merg
e
to
o
l,difft
o
ol:
D
ocume
n
t --tool-help con
s
istently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d Aguila
r
difftoo
l
: Disable
-
-s
y
mlinks
on
cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguilar
d
i
f
f
to
o
l: Handl
e
compare(
)
ret
u
rning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ilar
difftool
:
Wr
a
p lo
n
g lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid
A
guilar
d
if
f
to
o
l: Check all
r
eturn codes from
compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid Aguilar
d
i
ff
t
ool
:
Handle fi
n
ding mergetoo
l
s/ in a p
a
th with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
A
guilar
difftoo
l
:
Use sy
m
links when di
f
fi
n
g
against the w
o
r
ktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Ag
u
i
lar
difftool: C
a
ll th
e
tem
p
directory "git-difftool
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
diff
t
ool: Move optio
n
value
s
into a has
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool: Elimi
n
a
te glo
b
a
l
va
r
iabl
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Sim
p
lify print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Test difftool passing arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguila
r
mergetool: Pro
v
ide
a
n empty file w
h
en
n
eede
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Agu
i
lar
M
a
kefile: Impr
o
ve compiler he
a
der
d
e
p
endency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
me
r
g
etools/mel
d
: Use '--output' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
m
ergetool
-
-lib: Refactor tools in
t
o separat
e
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next