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: refactor stash_create
2016-12-12
David Aguilar
mergetools: fix xxdiff
hotke
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Dav
i
d Aguilar
di
f
ftool
:
rename variables
f
or consiste
n
cy
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftool: chdir as earl
y
a
s
possibl
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftool: sanitize $wo
r
kdir as early a
s
p
ossible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Da
v
id
A
g
uilar
difftool: f
i
x
dir-diff index creati
o
n when in a subdirec
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David
Aguilar
difftool:
fix
dir-diff
ind
e
x c
r
eation when in a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguila
r
m
e
rget
o
ol
s
/vimdiff: trust Vim's e
x
it code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
D
a
vi
d
Aguilar
merg
e
tool: honor mergetool
.
$tool
.
trustExitCod
e
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
me
r
getool: hon
o
r -O<orderf
i
le>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David A
g
uilar
mer
g
e
too
l
: honor diff
.
order
F
ile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetool:
mo
v
e m
a
in program flow in
t
o
a main() func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
ergetool: add copy
r
i
g
ht
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
d
ifftool: use G
i
t
::* fun
c
tions instead of
p
assing around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
Aguilar
difftool: avoid $GIT_DIR and $GIT_WOR
K
_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d Aguilar
subtre
e
: adjust function defini
t
io
n
s to matc
h
Codi
n
gGu
i
delines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
A
guilar
s
u
btree: adju
s
t s
t
yle to ma
t
ch CodingG
u
ideline
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Da
v
i
d
A
guilar
subtree: fix "git
s
ubt
r
ee split
-
-rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David
Ag
u
i
l
a
r
t7900-subtr
e
e
.
sh
:
fix quotin
g
and broken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: handle
u
nmerged files in dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
d
i
fftool:
i
nitial
i
ze
v
ari
a
bles for
r
e
a
dability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
mergetool: honor t
e
mpf
i
le confi
g
ur
a
tion when resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Agu
i
lar
me
r
g
e
t
ool: su
p
port delete/delete conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguil
a
r
d
i
f
f
tool: ignore symbolic
links
in use_wt_
f
ile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
D
avid Aguilar
cont
r
ib/
s
ubtree: ignore l
o
g
.
date config
u
ration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
avid A
g
uilar
m
e
rgetools: a
d
d
w
inmerge as a builti
n
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mergetool--lib: set
I
FS fo
r
dif
f
too
l
and mer
g
etool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agu
i
lar
mergetools: stop se
t
t
ing $status in merge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id Aguilar
m
ergetool: simp
l
if
y
conditi
o
nals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agui
l
ar
difft
o
ol--helper: add e
x
plicit exit statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
Aguil
a
r
merget
o
ol--
l
ib: remove use of
$
stat
u
s global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David
A
guila
r
difftool:
honor --t
r
ust-exit-code for
buil
t
in tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Dav
i
d
Aguilar
d
i
ff
t
ool:
add sup
p
ort f
o
r --trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
t7610-m
e
rg
e
to
o
l: add test cases for mergetool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
merget
o
ol: add
a
n option for writing to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vi
d
A
guila
r
mergetool: use
m
ore
conserv
a
tive temporar
y
filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-
l
ib-functions: adjust style
to matc
h
Co
d
ingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
t7610-
m
ergetool:
u
s
e
t
e
st
_
con
f
ig
t
o isolate
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
mergetools/meld:
make usage o
f
`--output` config
u
rable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
git-sh
-
s
etup: move GIT_
D
IR initialization i
n
t
o
a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
me
r
ge
t
ool: use more conservat
i
v
e
temp
o
rary
f
i
l
enames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-lib-functions:
a
djust sty
l
e to
m
atc
h
Co
d
ingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
t7610-mergetool: prefer test_co
n
fig
o
ver gi
t
confi
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t761
0
-
mergetool:
add missing && and r
e
move commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Agui
l
ar
t7610
-
mergetool: use tabs inst
e
a
d of a mix
o
f tab
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
completion: ad
d
-
-show-signature f
o
r log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguil
a
r
st
a
sh: prefer --qu
i
et ove
r
sh
e
ll redirection of th
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
id Ag
u
i
l
a
r
refs: m
a
ke rev-parse --quiet actually qui
e
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503: us
e
tes
t
_mus
t
_
be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David A
g
uilar
Docu
m
entation
:
a note a
b
out stdout f
o
r
g
i
t rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Agui
l
ar
c
leanups: ens
u
r
e that g
i
t-compat-u
t
il
.
h
is in
c
lude
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David
Aguilar
style
f
ix: aster
i
sks stick to th
e
va
r
iable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
a
vi
d
Aguilar
gi
t
k
:
Catch mkdtemp
error
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid Agui
l
ar
g
i
tk: Use
m
ktemp
-d to a
v
oid pr
e
dictable temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Agu
i
lar
g
itk: Honor T
M
PDI
R
when vie
w
ing
exte
r
nal
d
i
f
f
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguil
a
r
difft
o
ol: support repositories with
.
git-f
i
l
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Agui
l
a
r
pull: add --f
f
-
o
n
ly t
o
the
h
elp text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
id Aguilar
pull: add pull
.
ff co
n
figuratio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David
Agu
i
lar
imap-
s
end:
e
lim
i
nate HM
A
C dep
r
ec
a
tion warni
n
gs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h: eliminate SHA-1
d
epr
e
cation warnin
g
s on
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d
Aguilar
M
a
kef
i
le:
add support for Apple C
o
mmo
n
C
r
ypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Ma
k
efile: fix default
r
ege
x
settings on D
a
rwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David A
g
uilar
merge
t
ools/kdiff3: do n
o
t use --auto
when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David A
g
uilar
hel
p
.
c:
a
dd a
c
ompatibility comment to cmd_ver
s
ion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
contrib/mw-to-git/
t
/install-wiki
.
sh: use a lo
w
er
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id A
g
uil
a
r
contrib/
e
xam
p
les/git-re
m
ot
e
.
p
e
rl:
us
e
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests: use a lo
w
ercase
"
usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguil
a
r
git-svn: use a lo
w
erca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid A
g
uilar
Docume
n
tation/use
r
-manual
.
txt:
u
se
a lowerc
a
se "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
templates/h
o
oks--upd
a
te
.
sam
p
le: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
cont
r
ib/hooks/setgitpe
r
m
s
.
p
e
rl
:
use a lowercase "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
i
l
a
r
c
ontrib/e
x
amples: us
e
a lower
c
ase "
u
sage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contrib/
f
ast
-
i
mpor
t
/imp
o
rt-zips
.
py: us
e
spac
e
s instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
ib
/
fast-im
p
ort/import-zips
.
p
y
: fix broken err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contrib/fast-import: use a lowerca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
con
t
r
i
b/c
r
edentia
l
: use a
lowercase "usage
:
" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Ag
u
i
lar
git-cvsi
m
p
o
r
t: use a
l
owercase "usag
e
:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
gi
t
-cvsimport: use
a
l
o
wercase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
g
i
t-cvsexportcomm
i
t: use a lowercase
"u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archi
m
p
or
t
: us
e
a lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-merg
e
-
o
ne-file: use a lowercase "usage:"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-reli
n
k: use
a
l
owe
r
case
"
u
s
age:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
guilar
git-svn:
u
s
e a lowerca
s
e "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-sh-set
u
p: u
s
e
a low
e
rcase "u
s
age:"
s
tr
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Aguilar
t7800:
"
d
efau
l
ts" is no l
o
nger a builtin
t
ool
n
ame
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7
8
00
:
modernize te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Da
v
id Aguilar
t7800
:
up
d
ate copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: si
l
e
n
ce u
n
initializ
e
d var
i
able warn
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
A
gui
l
ar
p4merg
e
:
fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Aguilar
difftool--helper: f
i
x
p
r
i
ntf usa
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
v
i
d Aguilar
d
o
c: generate a list
of valid merge t
o
ol
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David A
g
u
i
lar
m
e
rge
t
ool--
l
i
b
:
add func
t
ions
f
or fin
d
in
g
availabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Agui
l
a
r
mergetool
-
-lib:
i
mprove the h
e
lp
t
ext
in guess_merg
e
_to
o
l()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
a
r
mergetool--lib:
sim
p
lify comma
n
d expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
u
il
a
r
mergetools: simpli
f
y how we
h
andle
"
vim"
and
"
d
e
fa
u
l
ts"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
me
r
get
o
ol--lib: im
p
rove sh
o
w_tool_hel
p
() out
p
ut
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
v
id Aguilar
mergetools/vim:
r
e
m
o
v
e
redundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mergetoo
l
s/p4merg
e
: H
o
nor
$TMPDIR fo
r
th
e
/dev
/
nu
l
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid Aguilar
mergetools/p4merge: H
a
n
dl
e
"/
d
ev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Da
v
i
d
Aguila
r
me
r
geto
o
l--li
b
: A
l
l
ow custom commands to ov
e
rride bui
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
g
uilar
gitk
:
Rename 'tagconte
n
t
s
'
to
'cached_tag
c
ontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next