repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
doc: camelCase the i18n config variables to improve readability
2017-06-19
David Aguilar
mergetools/meld: improve
compat
i
biilty with M
e
ld o
n
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David A
g
uilar
diff
t
ool: handle modified symlinks i
n
dir-
d
i
f
f
mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguila
r
t780
0
:
cleanup c
r
uft left beh
i
n
d by
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
Davi
d
Aguilar
t7800: remove whitespace befor
e
redir
e
ct
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
Dav
i
d
Aguilar
t7800: replace "wc -l" wi
t
h t
e
st_line_c
o
unt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
Da
v
i
d Aguilar
t7800: simpli
f
y basic
usage test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David Agu
i
lar
d
ifftool
:
fix bug wh
e
n pr
i
nti
n
g usag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David Aguilar
gitk
:
Remove tr
a
nsla
t
ed mes
s
age from
comment
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
mergetool
s
: fix xxdiff hotke
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Ag
u
ilar
difftool: rename v
a
riables
f
or consis
t
en
c
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
diffto
o
l
:
c
hdir as early as
p
ossibl
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Da
v
i
d
A
g
uilar
difftool: sanitize $wo
r
kd
i
r as ea
r
l
y as p
o
ssible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Davi
d
Agui
l
a
r
dif
f
too
l
:
fix dir-diff index cr
e
ati
o
n when
in a subdirecto
r
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David A
g
u
ilar
difftool: fix di
r
-
d
iff in
d
ex cre
a
t
i
o
n
w
h
en
i
n a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
D
a
vid Aguilar
mer
g
e
tools/
v
imdiff: tru
s
t Vim's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
Da
v
i
d
Aguilar
merge
t
ool: honor mergetool
.
$
t
o
ol
.
tr
u
stExitCode for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
Aguilar
mergetool
:
honor -O<
o
rd
e
rfi
l
e>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
A
g
uilar
mergetool: h
o
nor diff
.
order
F
ile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetoo
l
:
m
ove mai
n
program flo
w
into a main
(
) fu
n
cti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
v
id Aguilar
m
ergetool: add
copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
a
vid A
g
uilar
d
i
fft
o
ol: use Git::*
functions instead of pass
i
ng around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
A
g
uilar
difftool: avoid $GIT_
D
IR and $GIT
_
W
O
RK
_
TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
Agui
l
ar
subtree: adju
s
t function definitions to m
a
tch Codi
n
gGuidel
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Ag
u
ilar
subt
r
ee: adjust styl
e
to match Cod
i
ngGuidelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Agui
l
ar
s
u
btree: fix "git subtree spli
t
--rejo
i
n"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Da
v
id Aguilar
t7900-sub
t
re
e
.
sh: fix quoting
a
nd broken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool:
h
andle u
n
merged files in dir-diff m
o
de
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: ini
t
ialize variab
l
e
s
fo
r
reada
b
ility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
mergetool: hono
r
tempfile configurat
i
on when resolvi
n
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguil
a
r
mergetool:
s
u
pport delet
e
/del
e
te c
o
nfl
i
cts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguilar
difft
o
ol: ignore s
y
mbolic
l
i
n
ks in u
s
e
_
wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David A
g
uilar
c
o
ntr
i
b/subtree: ignor
e
l
og
.
d
a
te
c
onfiguration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Davi
d
Agu
i
lar
me
r
get
o
ols:
add winmerge
as a builtin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Ag
u
i
l
a
r
mergetool--lib: set
IFS for d
i
f
f
t
ool
an
d
merg
e
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
Aguila
r
mergetools
:
stop setting $st
a
tus
i
n me
r
ge_c
m
d(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agui
l
ar
m
erge
t
ool: si
m
plif
y
co
n
ditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
Aguil
a
r
difftool-
-
helper:
a
dd explicit exit statem
e
nt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
Aguil
a
r
m
ergetool--lib: remove us
e
o
f $status global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
d
ifftool: ho
n
or --t
r
ust-
e
xit-co
d
e for bu
i
ltin tool
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
D
a
vid Aguilar
difftoo
l
: add support for
-
-trust-exit
-
code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguila
r
t7610-me
r
g
e
tool: add test cas
e
s for mergetool
.
w
rite
T
oTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetoo
l
: add an option for wr
i
ting
to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
mergetool: us
e
mo
r
e
cons
e
rvative tempor
a
ry filena
m
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-l
i
b
-functio
n
s: adjust s
t
yle to match Coding
G
uidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
i
l
ar
t7610-mer
g
etool: use test_config to isolate tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
mergetools/meld: make usage o
f
`--outpu
t
` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
git-sh-s
e
t
u
p: m
o
ve GIT_DIR in
i
t
i
aliza
t
ion into
a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Agu
i
lar
mergetool: use m
o
re con
s
erv
a
tive temporary filenam
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Agu
i
lar
test-
l
ib-
f
unctions: adjus
t
s
t
yle to
m
atch
C
o
dingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
av
i
d A
g
u
i
lar
t7610-
m
erge
t
ool: p
r
efer
test
_
co
n
fi
g
over git c
o
nfig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
t
7
610-me
r
getool
:
add missing && and remove c
o
mmented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d
Aguilar
t
7
610-me
r
getool: use t
a
bs
instead of
a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David
A
gu
i
l
a
r
completion
:
add --sh
o
w-signa
t
ur
e
fo
r
l
o
g and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
id Aguilar
s
t
ash: prefer --qu
i
et over she
l
l redirec
t
ion of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
re
f
s: ma
k
e rev-parse --quiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503:
u
s
e
t
est
_
must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid
Ag
u
ilar
Documentati
o
n
: a n
o
te about stdout for git r
e
v-
p
arse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
cleanups: ensure t
h
at git-compa
t
-u
t
il
.
h
is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguil
a
r
stylefix: asterisks stick
t
o
t
he variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Da
v
id Aguilar
g
i
tk: Catc
h
mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Use mktemp
-
d to avoid predictable tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid A
g
uil
a
r
gitk: Honor T
M
PD
I
R when vie
w
ing external
d
iffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
diff
t
ool: support rep
o
s
i
tories with
.
git-
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull
:
add --ff-only
t
o the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Aguilar
pull: add pull
.
f
f configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David
Aguilar
im
a
p-s
e
nd: eliminate HMAC deprecation wa
r
n
ings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Agui
l
ar
cache
.
h:
e
l
i
mi
n
ate
S
HA-
1
deprec
a
t
ion wa
r
nings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguil
a
r
Makefile: add support for Apple CommonCrypt
o
facilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefil
e
: fix de
f
ault
r
egex s
e
tti
n
gs on Da
r
wi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kdiff3: do
not use --aut
o
when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vid Aguilar
he
l
p
.
c: add a compati
b
i
lity comment to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
contrib/mw-to-git/t/install-w
i
ki
.
sh:
use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
ar
contri
b
/example
s
/g
i
t-re
m
o
te
.
perl: use a lower
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
a
r
tests: use a l
o
w
e
r
case "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
g
i
t-svn:
u
s
e
a lowercase
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
Documen
t
ati
o
n/use
r
-manua
l
.
txt: use
a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguila
r
templa
t
es/hooks--
u
pdate
.
sa
m
pl
e
: use a lowercase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
ntrib/ho
o
ks/setgitper
m
s
.
per
l
: use a
l
o
wercas
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contrib/ex
a
mples: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/fast-impo
r
t/impor
t
-
z
ips
.
p
y: use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
ar
contrib/fast-import/im
p
or
t
-zip
s
.
py:
f
ix broke
n
erro
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
il
a
r
contrib
/
fast-import:
u
s
e
a
l
owercase "u
s
age:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
i
b/creden
t
ial: u
s
e a lowerc
a
se
"
usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
g
i
t-cvsimport:
u
se a
l
o
w
e
rca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-c
v
simport: use
a
lowerca
s
e "us
a
ge:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-cvsexportcommit:
use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-archimpor
t
: u
s
e a lowercase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguil
a
r
git
-
m
e
rge-
o
ne-file: use a
l
o
wercase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-
r
elink: use a
l
owe
r
c
a
se "
u
sage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-sh-setup
:
use a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Aguilar
t
78
0
0: "defaul
t
s" is no longer a built
i
n tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
A
guilar
t
78
0
0
: modern
i
ze tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David
Aguilar
t7800:
update cop
y
r
i
g
h
t notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David
Aguilar
diffto
o
l
:
sil
e
nce
u
ninitialized variabl
e
warnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Ag
u
ilar
p4m
e
r
g
e
:
f
ix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agu
i
lar
difftool--helper:
f
i
x
prin
t
f usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: gener
a
te a list o
f
valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
merget
o
ol--lib
:
add functions fo
r
f
i
nding ava
i
l
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merg
e
tool--lib: im
p
rove the help
text in guess_merge_t
o
o
l
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next