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
submodule.c: port is_submodule_modified to use porcelain 2
2017-03-15
David
Aguilar
difft
o
ol: ha
n
dle modif
i
ed
symli
n
ks
i
n dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguilar
t7800: c
l
eanup cruft l
e
ft
b
e
h
ind by
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
D
avid Aguilar
t7800: rem
o
ve whitespace before redirect
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David
A
g
u
ilar
t7800: rep
l
ace
"
wc -l"
w
i
th
test_line
_
count
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Aguilar
t7800: s
i
mplify basic usage test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David A
g
uilar
difftoo
l
:
fix bu
g
when
p
rinting usag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David Ag
u
ilar
gitk: Remove trans
l
ated mes
s
age from comments
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
merg
e
t
ools: fix xxdiff hotkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Dav
i
d Aguilar
di
f
ftool: rename var
i
ables f
o
r co
n
sistency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftool:
chdir as
e
a
r
l
y as po
s
sible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
vi
d
Ag
u
ilar
difftoo
l
: sanitize $wo
r
k
d
i
r
as
early as
poss
i
b
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David A
g
uilar
di
f
ftool: fix dir-diff index creation when in a subdire
c
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David
A
g
u
i
lar
difft
o
ol: fi
x
dir-diff i
n
dex creation
when in a subdire
c
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
Davi
d
Agu
i
lar
mergetool
s
/v
i
m
diff: t
r
ust Vim's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
merge
t
ool: h
o
nor m
e
r
g
e
tool
.
$tool
.
trustExitCode for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
vid Aguil
a
r
m
e
rg
e
tool: honor
-O<
o
rder
f
ile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
Aguilar
merge
t
ool: h
o
nor diff
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
avid Agui
l
a
r
mergetool:
move main
program flow int
o
a
m
ain() fu
n
ct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David A
g
uilar
mergetool: ad
d
copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
av
i
d Aguilar
diff
t
oo
l
: us
e
G
it::* f
u
nctio
n
s inst
e
ad of passing around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
Aguilar
difftool: a
v
oid $GIT
_
DIR and $GIT_WORK_TRE
E
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Da
v
id Aguilar
subtree: adjust funct
i
on defi
n
itions to
mat
c
h C
o
dingGuide
l
i
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
subtr
e
e
:
adjust style to m
a
tch
C
odingGu
i
del
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguila
r
su
b
tree: fix "gi
t
subtree split --r
e
j
o
in"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David A
g
u
i
lar
t7900-subtree
.
s
h: fix
quoting and br
o
ken &
&
chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Da
v
id Aguila
r
d
i
fftool: handle
unmerged files in dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Davi
d
Aguil
a
r
difftool
:
initial
i
ze var
i
ab
l
e
s
for rea
d
a
b
ili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
mergetoo
l
:
hon
o
r te
m
pf
i
le confi
g
uration when resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
a
vid Aguilar
mergetool: s
u
ppo
r
t delete/d
e
l
ete con
f
licts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David
A
gu
i
lar
difftool: ignore
s
ymbolic link
s
in u
s
e_wt_
f
ile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
D
avid Aguilar
contrib/
s
ubtree
:
ignore
log
.
d
a
t
e
confi
g
uration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Da
v
id Aguil
a
r
mer
g
etools: ad
d
winmerge as a
b
uiltin too
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguil
a
r
m
er
g
etool--lib: set IFS
for dif
f
t
o
ol
a
nd mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agui
l
ar
merget
o
ols: stop setting $status in merge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
merge
t
ool:
s
imp
l
ify condi
t
ion
a
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Aguilar
difftool--helpe
r
: add explicit exit stat
e
me
n
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Aguilar
merget
o
ol--li
b
: remove u
s
e o
f
$
s
t
atus
g
lobal
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
Dav
i
d
A
guilar
difftoo
l
: hon
o
r --trust-
e
xit
-
co
d
e fo
r
builtin too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Agu
i
la
r
d
i
fftool:
add
s
upport f
o
r --trust
-
exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t
7610-me
r
g
eto
o
l
:
add test cases for
m
e
rgetool
.
wri
t
eToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
mergetoo
l
:
add an
o
p
t
ion
f
or writin
g
to a
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool: use more conservative temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
test-lib-functio
n
s: adjust st
y
le to mat
c
h CodingGu
i
delines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7
6
10-mergetool: use tes
t
_
c
onfig to isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetools/meld: make us
a
ge o
f
`--
o
utp
u
t
` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
git-s
h
-se
t
up: move GIT
_
DIR initialization into a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
mergetool:
u
se more conservative temporar
y
file
n
ames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
g
u
ilar
test-l
i
b-functions:
adjust
style to match
Codin
g
Guidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id
A
g
uilar
t7610-me
r
geto
o
l
:
prefer test_con
f
ig over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-merg
e
tool: add missing
&
& and remove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Agu
i
l
a
r
t761
0
-mergetool: use tabs instead of a
m
ix of
tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
com
p
leti
o
n: add
--s
h
ow
-
signature for log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Aguilar
stash: prefe
r
-
-quiet over s
h
ell
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: m
a
ke rev-parse --qu
i
et actuall
y
quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Davi
d
Aguilar
t15
0
3:
u
se test_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Ag
u
ilar
D
ocumen
t
at
i
o
n: a
no
t
e about stdou
t
for
git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Agui
l
ar
cleanup
s
: ensure
t
h
at git-compa
t
-util
.
h is
i
ncluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Agui
l
ar
stylefix: as
t
erisks stick to the variable
,
no
t
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gitk
:
C
atch mkdtemp
e
r
ro
r
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Dav
i
d
A
guilar
gi
t
k: U
s
e mktemp -d t
o
avoid predicta
b
le temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguila
r
g
itk
:
Honor TMPD
I
R
when vie
w
ing exte
r
nal diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David
A
guilar
di
f
ftool: support
r
ep
o
sit
o
ries
w
ith
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull:
add --ff-on
l
y to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
p
ull: add pul
l
.
ff configu
r
ation
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-send:
eliminate HMAC depreca
t
ion warn
i
ngs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h: eli
m
inate
S
HA-1
d
eprec
a
tion wa
r
nings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
guilar
Makefile:
add support
f
o
r
Apple CommonCr
y
pto
f
a
c
ility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
avid Aguilar
Makefile
:
fix default r
e
gex settings o
n
Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
avid Aguilar
mergetools/kdiff3: do not use --auto when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
A
guilar
help
.
c: add a co
m
patibility co
m
ment to cmd
_
version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id Aguilar
c
o
ntri
b
/m
w
-to-
g
i
t
/t/inst
a
ll-wiki
.
sh: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/e
x
amp
l
es/git-rem
o
t
e
.
p
erl: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
te
s
ts: use a lowercase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid
A
guilar
git-
s
vn: use a lo
w
ercase
"
usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
Documentatio
n
/user-manual
.
txt: use a lowerca
s
e
"
u
s
ag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
tem
p
lates/hooks--up
d
a
t
e
.
sam
p
le: u
s
e a lowerca
s
e
"
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Ag
u
i
lar
contrib/
h
ooks/
s
e
t
g
itper
m
s
.
perl:
u
se a lowerc
a
se "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
contrib/
e
xamples: us
e
a lowerca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contri
b
/fast-im
p
or
t
/import-zips
.
py:
u
se spaces i
n
stead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
c
o
ntr
i
b/fast-impor
t
/import-
z
ip
s
.
py: f
i
x brok
e
n error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
contrib/fas
t
-import
:
use a lo
w
er
c
ase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contri
b
/credential: use
a lowercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
gi
t
-cvsimport: use a low
e
rcase
"
usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guil
a
r
git-cvsi
m
port: us
e
a low
e
rcase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsexp
o
rtco
m
mit: use a
l
owercase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
i
lar
gi
t
-archim
p
or
t
: use a l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-merge-one-file:
use a lowercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-relin
k
: use
a
lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
gi
t
-svn: use a l
o
wercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agui
l
a
r
git-sh-setup:
u
se a lowercase "
u
sa
g
e:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Ag
u
ilar
t7800: "d
e
faults" is no longer a builtin tool
nam
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid Agu
i
lar
t7
8
0
0: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David A
g
uil
a
r
t7800
:
up
d
ate copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Ag
u
ila
r
diffto
o
l: silence uniniti
a
lized variab
l
e warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguilar
p4mer
g
e: fi
x
printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftoo
l
-
-
h
elper: fix p
r
int
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
Aguilar
doc: gen
e
r
a
t
e
a li
s
t of vali
d
merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib: add function
s
for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
m
ergetool--
l
ib: improve the he
l
p
t
ext in guess_mer
g
e_too
l
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Agui
l
ar
m
e
rgetool-
-
lib: simplify command expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next