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
A
g
uilar
merg
e
tools: fix
x
x
d
iff hotk
e
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
Dav
i
d Aguilar
diff
t
ool: fix dir-diff
i
nd
e
x
creatio
n
when in a subdirector
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguila
r
m
e
rgetools/vimdiff: trust Vim
'
s
ex
i
t code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Agui
l
ar
mergetool: honor mergetool
.
$tool
.
t
r
ustExitCode for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
A
guil
a
r
merget
o
ol: hon
o
r -O<orde
r
file>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetool: honor diff
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David A
g
uilar
mergetool
:
mo
v
e main program
flow into a main() function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
v
id Aguilar
mergetool: add
c
o
p
yright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d Aguilar
d
i
fftool: use
Git
:
:
* fun
c
tions i
n
s
tead of passing ar
o
und
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difftool: avoi
d
$
GIT_DIR and $GI
T
_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
Aguilar
subtree: adjust
fun
c
t
i
on definitions to
m
atch CodingGuid
e
lines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David A
g
u
ilar
subt
r
ee: adjust style to match C
o
d
i
ngGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
subtree: fix "git
s
ubtr
e
e split
-
-rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Da
v
id Aguilar
t7900-subtree
.
sh: fix quo
t
ing and br
o
k
e
n && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
A
guilar
difft
o
o
l:
h
andle unmerg
e
d file
s
in
dir-di
f
f mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
A
g
ui
l
ar
di
f
ft
o
o
l
: in
i
tialize
v
ariables
f
or
rea
d
abi
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David
A
guilar
mergetool:
h
onor tempfile configu
r
atio
n
wh
e
n resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
mergetool
:
support d
e
lete/delete
conf
l
icts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguilar
difft
o
ol:
i
gnore symbo
l
ic links in use_w
t
_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Agu
i
lar
co
n
trib/subt
r
ee: ignor
e
log
.
date confi
g
uration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mer
g
etoo
l
s: add
winmerge as a bui
l
t
i
n to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
m
e
rgetool--lib: set IFS for difftool
a
nd merget
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetoo
l
s: stop setting $status in mer
g
e_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agu
i
l
a
r
m
ergetool: simplif
y
conditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
dif
f
tool--he
l
pe
r
:
a
dd explici
t
exit statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
Agui
l
a
r
merget
o
ol
-
-lib: remove use of $status
g
lo
b
a
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David
Aguilar
diffto
o
l: hono
r
-
-
trust-exit-cod
e
for builti
n
to
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Da
v
id Aguilar
difftoo
l
: add support for
-
-trust
-
exi
t
-
c
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Ag
u
ilar
t7610-mergetool
:
add
t
est
c
ase
s
fo
r
mergetool
.
w
r
i
t
e
T
oTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
mergetool:
add
a
n opti
o
n
for writ
i
n
g
to a t
e
mp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
i
d
Ag
u
ilar
mergetool: u
s
e mo
r
e c
o
n
s
e
rvat
i
v
e
tempor
a
ry
filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
te
s
t
-lib-fun
c
tions:
a
djust style to
ma
t
ch C
o
din
g
Guidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool:
u
se
t
est_confi
g
to
isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
mergetools
/
meld: make usage o
f
`
--output
`
c
o
n
figurabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
git-sh-setup:
m
ove GIT_DIR initia
l
ization into a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
A
gu
i
la
r
m
e
rgetool: u
s
e
more cons
e
rv
a
tive tem
p
orary filena
m
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agui
l
ar
test-lib-funct
i
ons
:
adjust sty
l
e to
m
at
c
h
CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
i
d
Aguilar
t
7610-merg
e
tool: pre
f
e
r test_config ove
r
git co
n
f
ig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Agu
i
la
r
t7610-mergetoo
l
:
a
dd miss
i
n
g && and remove
commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
t
7
6
1
0-m
e
rgetool: use tabs instead of a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Davi
d
Aguilar
completion:
add --show-signature fo
r
l
o
g and
show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash: prefe
r
--quiet over shell
redirection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David
A
guil
a
r
r
efs: make re
v
-pars
e
-
-
quiet ac
t
ually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Davi
d
Aguilar
t
1503: us
e
t
est
_
mu
s
t_be_empt
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d
A
g
u
ilar
Documen
t
ation: a n
o
te abou
t
stdout for g
i
t rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
A
guilar
cleanups
:
ensure that
g
i
t
-compat-ut
i
l
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
D
avid Aguilar
s
tylefi
x
: asterisks stick to t
h
e vari
a
ble, not
t
he
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguil
a
r
gitk: Catch
mkdtemp er
r
ors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David
A
g
u
i
lar
gitk:
Use mkt
e
mp -
d
to avoid p
r
edictable temp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid A
g
uila
r
gitk: Ho
n
or TMPDIR when
v
iewi
n
g
e
x
terna
l
di
f
fs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
D
avid
A
guilar
d
iffto
o
l:
su
p
port repositories with
.
g
i
t
-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Ag
u
i
l
a
r
pul
l
: add -
-
ff-only to
t
h
e h
e
lp text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguil
a
r
pull
:
add pull
.
ff
c
on
f
i
guration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David
Aguil
a
r
imap-
s
e
n
d: eliminate
H
M
AC
d
eprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid
Ag
u
ilar
cache
.
h
:
e
liminate SHA-1
deprecation wa
r
nin
g
s o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
id Aguilar
Makefile:
a
dd support
for Apple CommonCrypt
o
faci
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Davi
d
A
guilar
Ma
k
e
file: fix default r
e
gex sett
i
n
g
s on Darwi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David
Agu
i
la
r
mergetools/kdiff3: do
n
ot use --auto when
diffi
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vid Aguilar
help
.
c: add
a compatibil
i
ty comm
e
nt
t
o
cmd_version
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/mw-to-git/
t
/in
s
t
a
l
l-
w
i
k
i
.
sh: use a lowe
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguila
r
contrib/exa
m
ples/git
-
re
m
ote
.
perl
:
use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
tests: use a
l
owerc
a
se "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguila
r
gi
t
-svn: use
a l
o
wercase "usage:"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
Doc
u
mentation/user-manual
.
txt: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
templates/hooks--
u
pdate
.
sample: use a l
o
wercase "u
s
a
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
il
a
r
con
t
rib/hoo
k
s
/
se
t
g
i
tperms
.
per
l
: u
s
e a
l
owe
r
case "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguilar
contrib
/
examples: u
s
e a lowercase "usa
g
e:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/fast-
i
mport/import-
z
ip
s
.
py: use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguil
a
r
contrib
/
fast
-
im
p
ort/im
p
ort-
z
i
ps
.
py: fi
x
br
o
ken
error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contri
b
/fast-i
m
port: u
s
e
a
lower
c
ase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
co
n
tri
b
/cre
d
e
ntial: u
s
e
a
low
e
rcase
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid A
g
uilar
git-
c
vsimport: use
a
lo
w
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimport: us
e
a
lowercas
e
"
usa
g
e
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
l
a
r
git-cvsexportc
o
mmit: us
e
a
l
owerc
a
se
"
usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-archimport: use a lowercase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-mer
g
e-
o
ne-file: us
e
a lowercas
e
"usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
gi
t
-relink: u
s
e a l
o
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-svn: use a
lowe
r
c
a
se
"u
s
a
g
e:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
a
r
g
i
t
-sh-
s
etup: use
a
lowercase "usage
:
" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Aguilar
t7800: "
d
e
fault
s
"
i
s
no longer a builtin tool na
m
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Agu
i
lar
t7800: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t78
0
0: up
d
at
e
copyrigh
t
n
o
ti
c
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: sil
e
n
ce uni
n
itialized variable wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguil
a
r
p4merge: fix pr
i
ntf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
i
d Aguilar
di
f
ftool-
-
h
elper:
f
ix printf
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Ag
u
i
lar
doc: generate a list of valid merge tool
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
mergeto
o
l--lib: ad
d
func
t
i
o
n
s for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguila
r
me
r
g
e
t
ool--lib: i
m
prove the
h
elp text in guess_merge_too
l
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ila
r
merg
e
too
l
--l
i
b: simp
l
ify co
m
man
d
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetools:
s
implify how we hand
l
e "vim" a
n
d "defa
u
lts"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
e
r
g
e
tool--lib: im
p
r
ove show_to
o
l
_help()
o
u
t
p
ut
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/vim: remove redundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
merge
t
ools/p4merge: Ho
n
or
$
T
MPDIR for
the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mergetools/p4merge: H
a
ndle "/de
v
/null
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--lib: Al
l
ow custom commands
t
o override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
g
i
t
k: Rena
m
e
'
t
a
gcontents' to 'cached_tagcon
t
ent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
Aguilar
g
i
tk: Teach "Reread refere
n
ces" to reload
tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Ag
u
ilar
mergetool,difftool: D
o
cument --tool-help consis
t
entl
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
di
f
fto
o
l
: Disable
-
-sy
m
links on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avi
d
A
guilar
difftool: Handle compare() returnin
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next