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
Second batch for 2.12
2016-12-12
David Aguilar
mergetools: fix xxdi
f
f hot
k
eys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David Ag
u
i
l
a
r
difftool: fix dir-di
f
f index
c
reatio
n
whe
n
i
n
a subdirec
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David A
g
uilar
mergeto
o
l
s/vimdiff: t
r
ust Vim
'
s exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
Dav
i
d
A
g
uilar
mergetool: honor mergetool
.
$tool
.
trustEx
i
tCode for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
A
g
uilar
merge
t
ool: honor -O
<
orderfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Agu
i
l
a
r
mer
g
etool
:
ho
n
or diff
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Agu
i
la
r
me
r
getool: move
main
p
rogram
f
l
ow into a main(
)
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
vid Aguilar
mergetool: a
d
d c
o
pyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
d
i
fftool
:
us
e
Git::*
f
unctio
n
s i
n
s
t
e
a
d of passing around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
Aguilar
diff
t
ool: avoid $GIT_DIR a
n
d $GIT_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Agui
l
ar
su
b
tree: adjust f
u
nction definit
i
ons to match
C
odingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
subtr
e
e: adjust sty
l
e
to match CodingGu
i
deli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
subtre
e
: fix "gi
t
subtree split --rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
D
avid Aguila
r
t
7900-subtree
.
sh
:
fix quoting and broken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Agui
l
a
r
d
ifftool: handl
e
unmer
g
ed
files in dir-d
i
ff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool:
i
nitialize variab
l
es for
r
eadability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David
A
guilar
me
r
g
e
to
o
l:
h
onor tempfile c
o
nfiguration when resolvi
n
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Da
v
id
A
guilar
mergetoo
l
:
s
u
ppor
t
delete/delete
confli
c
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
Davi
d
A
g
uilar
diffto
o
l: ignore symbolic links in use_w
t
_
f
i
le
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
Dav
i
d A
g
uilar
contr
i
b/subtree: ignore log
.
date
configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Ag
u
il
a
r
m
e
rget
o
ols: add winmerge
as a b
u
iltin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
avid Agu
i
l
ar
mergetool--lib: se
t
IFS for
d
ifftool and
mer
g
etool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id A
g
uilar
m
erg
e
tools: stop se
t
ting
$statu
s
i
n me
r
ge_cmd
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
Aguila
r
mergetool: sim
p
li
f
y
conditio
n
als
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
v
id Aguilar
difft
o
ol--helper: add
e
xpl
i
ci
t
e
xit statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id Aguilar
mergetool--l
i
b: remove us
e
o
f $status global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
difftool
:
honor --trust-exit
-
code for
b
ui
l
tin
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Da
v
id A
g
u
ilar
dif
f
tool: a
d
d support for --trus
t
-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id
Aguilar
t7610-merget
o
ol:
add test cases for mer
g
etoo
l
.
w
r
iteToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool: add
an opt
i
on
f
o
r writing
t
o a temporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
me
r
g
e
too
l
:
use more conse
r
vative te
m
p
o
r
a
ry filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
tes
t
-lib-functions
:
adjust
s
t
yle
to match C
o
dingGuidelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d
A
guil
a
r
t7610-mergetool: use test_config
t
o isolate
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetools/meld:
make
usage of `--output` conf
i
gur
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid
A
guilar
git-
s
h-s
e
tup: move GIT_DIR initial
i
zation into
a f
u
nct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
mergetool: us
e
m
or
e
conservative
t
empor
a
ry
f
ilenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
test-lib-funct
i
ons: adjust
s
tyle to match Codin
g
Guid
e
lines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetoo
l
:
prefer test_con
f
ig over
g
it config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7
6
10-me
r
getool: add
m
i
s
sing && and remove
c
om
m
ented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool:
u
se
t
abs instead of
a mix of
tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
completi
o
n: add --
s
how-signature for log and sh
o
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David
A
guilar
stash: pref
e
r --qui
e
t over shell redirect
i
on of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguil
a
r
refs: make rev-parse --q
u
iet act
u
ally quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguil
a
r
t1503:
use t
e
st_must_be_empt
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Doc
u
m
e
ntation: a note about stdout for git rev-
p
a
rs
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguil
a
r
cleanups:
e
nsure tha
t
git-compat-u
t
i
l
.
h i
s
included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
D
a
vid Aguilar
stylefix: asterisks s
t
ick to the v
a
riab
l
e
, not th
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguil
a
r
gitk: Catch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David
A
g
u
i
lar
gitk:
U
se mktemp -d to avoid predic
t
able temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
v
i
d
Aguila
r
gitk: Ho
n
or TMPDIR when viewing ext
e
rnal diff
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
D
a
vid Aguilar
diffto
o
l
: supp
o
rt repositories with
.
git-fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David A
g
uilar
pu
l
l: a
d
d --ff
-
only to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Aguil
a
r
pull: ad
d
pull
.
ff configur
a
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Da
v
id
Aguilar
imap-se
n
d:
e
l
imin
a
te
H
MAC de
p
re
c
ation warnings
on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h
: elimin
a
te
SHA-1
deprecation
w
a
r
n
i
ngs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
Aguilar
Makefile: a
d
d su
p
p
ort for
A
pple CommonCrypto
f
a
cility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Mak
e
f
i
le:
fix defau
l
t re
g
ex settings on D
a
rwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
a
vid Aguil
a
r
mer
g
et
o
ols/kdiff3:
d
o not us
e
--auto when diffi
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c: add a
c
o
mpatibili
t
y comment
t
o
cmd_versio
n
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
contri
b
/mw-to-
g
it/t/instal
l
-
w
iki
.
sh:
u
s
e a lower
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
contrib
/
examples/git-
r
emot
e
.
per
l
:
u
s
e
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Ag
u
ilar
tests: us
e
a lo
w
ercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
git-svn: use
a
low
e
r
case "u
s
age
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Do
c
ument
a
ti
o
n
/
us
e
r-m
a
n
ual
.
txt: use a lowercase
"
usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
lar
templates/h
o
oks-
-
update
.
sampl
e
: use a low
e
rca
s
e
"
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contrib
/
hooks/setgitper
m
s
.
perl: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/ex
a
m
ple
s
: use
a
lowercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contri
b
/
f
ast-im
p
ort/
i
m
p
ort-zips
.
py: use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fa
s
t-
i
mpor
t
/import-zips
.
py: fix
b
roken err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gu
i
lar
co
n
tri
b
/
f
ast-im
p
ort
:
use a lower
c
ase "usage:"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
co
n
trib/credential: u
s
e
a
l
ow
e
rcase "us
a
ge:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gu
i
lar
git-cvsimport: use a l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
g
i
t-cvsimport: use a lo
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsexportc
o
mmit:
use a lowercase
"
usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-archimport: use a lowe
r
case "us
a
ge:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d Agu
i
lar
git-merge-one-file: use
a lowercase "us
a
ge:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
A
guilar
g
it-r
e
link:
use a lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-
s
vn: use
a lowercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-setu
p
:
use
a
lowercase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguila
r
t7800:
"defaults" i
s
no longer a builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
A
guil
a
r
t7800:
m
o
dernize te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David A
g
uilar
t78
0
0:
u
pdate c
o
pyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguila
r
d
ifftool: silence uniniti
a
l
ized
v
ariable war
n
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Aguilar
p4mer
g
e: fix pr
i
nt
f
u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
d
ifftool--he
l
per: fix print
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: generate a list of valid m
e
rge t
o
ols
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
merg
e
t
o
ol--lib: add
functions f
o
r finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid A
g
uilar
merg
e
tool--lib: improve
t
he help text
in guess_merge_too
l
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--
l
ib: simplify comma
n
d
e
xpressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
mergetools: simplify
how we handle "vim" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
u
i
lar
mergetool--lib: improve show
_
t
ool_
h
e
l
p() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ilar
mergetools/vim
:
remove
redund
a
nt diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguil
a
r
merget
o
o
l
s/p4merge: H
o
nor $
T
MPDIR for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id Aguil
a
r
m
e
rgetools/p4
m
erge
:
H
andle "/d
e
v/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
m
ergetool--lib: All
o
w custo
m
commands to o
v
err
i
de buil
t
-
i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agui
l
a
r
gitk: Rename 't
a
gcontent
s
' to 'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Te
a
ch "Reread re
f
e
r
ences
"
to r
e
lo
a
d
tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Agui
l
ar
mer
g
e
t
o
o
l,diffto
o
l: Document --tool-help
c
onsisten
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ilar
difftool: Disable --symlinks o
n
c
y
g
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool:
H
and
l
e c
o
m
p
are()
returni
n
g
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next