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
stash: allow pathspecs in the no verb form
2016-12-12
D
avid Agu
i
lar
m
erge
t
ools:
f
ix xxdiff h
o
tkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Agui
l
ar
diff
t
ool: rename var
i
ables
fo
r
consistency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
avid Aguilar
dif
f
t
ool: chdir as
early as possib
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difft
o
ol: sani
t
ize $workdir as earl
y
as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftool: fix d
i
r-diff index creati
o
n when in a sub
d
irectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David A
g
u
i
la
r
diff
t
ool:
f
ix di
r
-diff ind
e
x
creat
i
on when
i
n a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David A
g
uila
r
merget
o
ols/vimdi
f
f: trust Vim's
e
xit cod
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
D
avid
A
guilar
mergetool:
h
onor mergetool
.
$tool
.
trustExitCode for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguil
a
r
m
e
rgetool:
ho
n
or -O<
o
rde
r
file>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Davi
d
Ag
u
i
l
ar
merget
o
o
l: honor diff
.
ord
e
rFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David A
g
uilar
mergeto
o
l
: move main pr
o
g
r
am flow into a
main() function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Dav
i
d Aguilar
me
r
g
etool: ad
d
copyri
g
ht
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
a
v
i
d Agu
i
lar
difftool: use Git::* functions ins
t
ead of pa
s
s
i
n
g
around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguil
a
r
difftool: avoid $GI
T
_DIR and $GIT
_
WORK_T
R
EE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
Aguilar
subt
r
ee
:
adjust func
t
ion def
i
n
i
tions to ma
t
ch Codin
g
G
u
idelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
Aguilar
subtre
e
: adjust
s
tyl
e
to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
subtree: fix "git s
u
btr
e
e split
--
r
ejoi
n
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
t7900-subtree
.
sh:
f
ix quoting and
broken &&
c
h
a
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Davi
d
Aguilar
diff
t
ool: han
d
l
e u
n
merged files in
di
r
-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difft
o
o
l: initia
l
ize v
a
riabl
e
s for readabilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David
A
guilar
m
ergetool: honor tempfile configurat
i
on wh
e
n resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
avid Aguilar
mergeto
o
l: support del
e
te/del
e
te
conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Agu
i
la
r
difftool: ignore symbol
i
c
links in use_
w
t_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Ag
u
ilar
c
o
ntrib/subtree
:
i
g
nore log
.
d
ate con
f
igurati
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Davi
d
Aguilar
mergeto
o
ls
:
ad
d
winmerge as a b
u
ilt
i
n
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguil
a
r
m
e
r
g
etool--lib: set
I
F
S
for diff
t
ool and
mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d A
g
ui
l
ar
mergetoo
l
s
:
stop
s
etting
$
status in m
e
rge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Agu
i
lar
mergetool: simplify conditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agu
i
l
a
r
difftool--
h
e
l
p
e
r
:
add explicit
e
x
i
t statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguila
r
merget
o
ol--lib: remove use of $status glo
b
al
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
difftool: honor --trust
-
exit-code for b
u
iltin
t
ools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
di
f
f
t
o
ol: add
s
upport for --trust-e
x
it-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Agu
i
lar
t7610-
m
er
g
etool:
a
d
d test cases f
o
r mer
g
etool
.
w
r
iteToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merg
e
tool: add an option
for wri
t
i
n
g to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Agu
i
lar
me
r
get
o
ol: use more conservative temporary f
i
l
e
names
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-lib
-
functions: adjust st
y
le
t
o match
Coding
G
uidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
t7610-mergetool: use tes
t
_config to i
s
olate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guil
a
r
me
r
getools/meld:
m
a
ke u
s
age o
f
`--output` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Agui
l
ar
git-sh-
s
etup: mo
v
e
GIT_DIR initi
a
liz
a
tion
i
nt
o
a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
me
r
getool: use
m
o
re
c
onservative tem
p
orary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Agu
i
l
ar
test
-
l
i
b-fu
n
c
t
io
n
s: adjust st
y
le to matc
h
Codin
g
G
uidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
t7610-mergetool: pre
f
er test_config over
git c
o
nfig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7610
-
m
e
rgetool: add mi
s
sing && and r
e
m
o
ve
commen
t
ed
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Agu
i
lar
t7610-m
e
rg
e
tool: use tabs instea
d
of a mix of t
a
bs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
D
avid Agu
i
lar
completion: add --
s
how-signature for log an
d
show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguil
a
r
stash:
prefer --quiet o
v
er shell
redire
c
tion of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
r
e
fs: make
rev-
p
ar
s
e --qu
i
et ac
t
ually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David
Aguilar
t1503: use
test_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Da
v
id Ag
u
ilar
Documen
t
ation: a
note abo
u
t st
d
out for git r
e
v-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid Aguilar
cle
a
nups: e
n
sure th
a
t git-co
m
p
a
t-util
.
h
is
i
n
c
luded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
stylefix: asterisks
stick
to the
v
a
riable
,
no
t
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
a
v
id
Aguilar
gitk: Catch mkdte
m
p errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
g
i
t
k
: Use mktemp
-d
t
o avoid pred
i
ctable tem
p
orary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
g
itk: Honor
T
MP
D
IR when viewing exter
n
al diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguil
a
r
difftool: support re
p
osi
t
or
i
es wit
h
.
g
it-fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
i
d
Aguilar
pull: add --ff
-
only t
o
the help
t
e
x
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pul
l
: add pull
.
f
f c
o
nf
i
g
u
rat
i
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David
Ag
u
ilar
imap-sen
d
: elimina
t
e HMAC deprecation w
a
rnings o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
id Agui
l
a
r
cache
.
h
: e
l
iminate SHA-1 de
p
recation warnings
on
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
Aguilar
Makefile: add support for Appl
e
CommonCryp
t
o facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
av
i
d Aguilar
M
akefile:
fix default regex
set
t
ings
o
n
Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
avid
A
g
uilar
mergeto
o
ls/kdiff3
:
do not
u
s
e --auto whe
n
di
f
fing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d Aguilar
help
.
c: add a com
p
a
t
ibility c
o
mm
e
nt t
o
c
m
d
_
vers
i
on()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
c
o
ntr
i
b/mw
-
to-
g
it/
t
/install-wiki
.
sh: u
s
e a l
o
wercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid
A
guilar
c
ont
r
ib/examples/git-r
e
mote
.
perl: use a lo
w
ercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
lar
tests:
use
a
lowe
r
case "u
s
age:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
git-svn: use a lowercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Do
c
umentati
o
n/u
s
e
r-manual
.
txt: use a lowercas
e
"usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
templates/hooks--update
.
sam
p
le: us
e
a lo
w
ercase
"
u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Ag
u
ilar
c
o
ntr
i
b/hoo
k
s/setgitperms
.
perl: use a
lowercase "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
contr
i
b/examples: u
s
e a lowercase
"
usag
e
:" st
r
in
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
trib/fast
-
im
p
ort/
i
mport-zips
.
py: use spac
e
s
i
nstead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
ilar
co
n
trib/fast-imp
o
rt/impor
t
-
zips
.
p
y
: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
ib/fast-import: use a lower
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Agu
i
lar
contri
b
/credential: use a l
o
wer
c
ase "u
s
age:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
g
uilar
git-cv
s
import: use
a lowercase "usage:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
guila
r
git
-
cvsimpor
t
: use
a
lowercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
g
it-cvsexpo
r
t
commi
t
:
use a lowercase
"
usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-archimport: use
a
lowerc
a
se "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-merge-one-file: use a lowerc
a
se
"
usage:
"
s
trin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relink: use
a
lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-
s
vn: use a l
o
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-sh-setup: use a
l
owercase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Davi
d
Ag
u
ilar
t7800: "de
f
aults" is n
o
longer a builtin
t
ool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Davi
d
Aguilar
t7800:
m
oder
n
iz
e
tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David
A
guilar
t780
0
:
update copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
avid Aguilar
di
f
ft
o
ol:
s
ilenc
e
uninitialized v
a
riable
war
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p
4
merge: fix prin
t
f us
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id Agui
l
ar
difftoo
l
--h
e
lper: fi
x
printf usag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Agu
i
l
a
r
doc: generate a lis
t
o
f
valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetoo
l
--lib: add fun
c
tions for
f
inding avail
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
mergeto
o
l--lib
:
impro
v
e
t
he help tex
t
in
g
u
ess_merge_too
l
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
m
erge
t
ool--lib
:
simplif
y
comma
n
d expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
mergetools: simplify how we
h
andle
"vim
"
and "def
a
ults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agui
l
ar
me
r
ge
t
o
o
l--
l
ib: improve
show_tool_help() outpu
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
i
d Aguilar
mer
g
etools/vim: remove redundant di
f
f c
o
mmand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David A
g
uilar
m
e
rgetools/p4
m
erge: Honor $TMPDIR for t
h
e /
d
ev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mergetools/p4merge
:
Hand
l
e "/
d
ev/nul
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
m
ergetool--lib: A
l
low cus
t
om com
m
a
n
d
s
t
o
override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguilar
g
it
k
:
Rename 'ta
g
contents' to
'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next