repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool: honor diff.orderFile
2016-10-11
David A
g
u
i
l
ar
mergetool: honor diff
.
orderFile
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
ergetoo
l
: move main pr
o
gram flow into a mai
n
() function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergeto
o
l: add
c
o
p
yright
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difftool:
u
s
e
Git
:
:* functions instead of passing
arou
n
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
D
a
v
id Aguilar
difftool: avo
i
d $
G
IT
_
DIR
a
nd $GIT_W
O
R
K
_TREE
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
subtre
e
: adj
u
st function d
e
finiti
o
n
s
to match Co
d
ingGuidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
D
avid Aguilar
s
u
b
tree: ad
j
u
s
t
s
tyle to match Cod
i
ng
G
ui
d
e
lines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-26
David Aguila
r
subt
r
ee:
f
i
x
"g
i
t subtree
split --re
j
oin"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-26
D
a
v
i
d Agu
i
l
ar
t7900-s
u
btree
.
sh: fix qu
o
t
i
ng and broken &&
chains
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difft
o
ol: handle un
m
erged files in dir-diff mode
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-05-16
Da
v
id Aguil
a
r
difft
o
ol:
i
n
it
i
al
i
ze variables f
o
r
read
a
b
i
lity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-03-10
Davi
d
A
guilar
mergetool: ho
n
or
t
empfile configuration
when res
o
lvin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
mergetool: support delete/dele
t
e conflicts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-10-29
David
A
g
uil
a
r
d
if
f
tool: ignore symbo
l
ic l
i
nk
s
in
use_wt_f
i
le
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-23
David Agu
i
lar
con
t
ri
b
/
s
ubtree: i
g
nore log
.
da
t
e confi
g
ura
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-20
D
a
vid Agu
i
lar
mergetools: add
wi
n
merge as
a builtin tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-20
Davi
d
Aguilar
merge
t
ool--
l
ib: se
t
IFS for
d
ifftool and mergetoo
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Ag
u
ilar
mergetools: st
o
p s
e
tting $status in
m
erge_cmd()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David
A
guilar
mergetool: simplify conditionals
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
difftool--helper: add explicit
e
xit
statement
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
Aguilar
mergetoo
l
--lib: rem
o
ve use of $s
t
atus global
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-14
David Agui
l
ar
difftoo
l
: honor --tru
s
t-ex
i
t-code for
b
uil
t
in tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
d
i
f
ftool: add support for --tru
s
t-ex
i
t-code
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
t7
6
10-mergetoo
l
: add test c
a
ses
for mergetoo
l
.
w
r
i
t
eToTe
m
p
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merg
e
t
ool: add an option for writin
g
to a temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
m
ergetool
:
u
s
e more c
o
nservative tempo
r
ary filenames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Agu
i
lar
tes
t
-lib-func
t
ions: adjust style t
o
match C
o
dingGuidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
t7610-merge
t
ool: use
t
est
_
config to i
s
olate tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
merget
o
o
l
s/mel
d
: mak
e
usage of `--output` config
u
rabl
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguilar
git-sh-setup
:
m
ove GIT
_
D
I
R ini
t
i
a
liz
a
t
i
on
i
nto a f
u
ncti
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Agui
l
ar
mergetool: use m
o
re co
n
servative temporary filenames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Ag
u
ilar
tes
t
-lib
-
fu
n
ctions
:
adjust style to match CodingGu
i
delines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-merg
e
tool:
p
refer test_config over g
i
t config
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
t7610-me
r
geto
o
l: add mis
s
in
g
&& an
d
remove
c
ommented
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t7610-mer
g
etool:
u
se tabs instead of a mix of tabs
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-07
Dav
i
d Agui
l
ar
co
m
pletion: add
-
-show
-
si
g
nature for log and show
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash:
prefer --q
u
iet o
v
er shel
l
redire
c
tion of
the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
David
Aguilar
refs: mak
e
rev-parse
--quiet actually quiet
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-16
D
a
vid Aguilar
t
1
503: use t
e
s
t_
m
ust_be_em
p
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Doc
u
m
e
nt
a
tion: a note about stdout
f
o
r
git rev-parse
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d Aguilar
c
le
a
nups: ensure that git-compat-util
.
h is included
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-02
D
avid A
g
uilar
stylef
i
x:
a
st
e
risks stick to t
h
e var
i
a
ble,
not the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
D
a
vid Aguilar
git
k
: Catch mkd
t
emp
e
rrors
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
Dav
i
d Aguilar
git
k
:
Use mktemp -d to avoid
p
red
i
ct
a
ble temporar
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Honor TMPDIR when vie
w
ing e
x
ternal diffs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David Ag
u
il
a
r
difftoo
l
: support repo
s
itories with
.
git-fil
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Aguila
r
pull:
a
dd --ff-o
n
l
y to the help text
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add pull
.
ff config
u
r
a
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
Da
v
id
Aguilar
i
ma
p
-send: eliminate
HMAC deprecation warni
n
gs
o
n M
a
c
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d Ag
u
ilar
cache
.
h:
eliminate S
H
A-1 depre
c
ation warnings
on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Agui
l
ar
Mak
e
f
i
l
e
:
add support f
o
r Apple Common
C
rypto facil
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
Dav
i
d Agui
l
ar
M
akefile: fix defau
l
t regex
se
t
tin
g
s
o
n
D
a
rwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kdiff3: do not use --auto w
h
en
diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d A
g
uilar
help
.
c: add a co
m
patibility comment to
c
md_version()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
con
t
rib/
m
w-to
-
git/t/instal
l
-
w
iki
.
sh:
use a lower
c
ase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
a
r
contrib/
e
xamples/gi
t
-r
e
mo
t
e
.
perl: u
s
e
a
lowe
r
c
ase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests: use
a
lowerca
s
e
"usa
g
e:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guila
r
git-svn: use a lowercase "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
Aguilar
Documentation/use
r
-m
a
nu
a
l
.
tx
t
:
u
se a lowerca
s
e
"usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Ag
u
ilar
templates/hoo
k
s--updat
e
.
sa
m
p
le: use a lowercase "
u
s
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
c
o
ntrib/hooks/setgit
p
erms
.
perl: use a lowercas
e
"usag
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
a
r
contrib/examples:
use a low
e
rcase "us
a
ge
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
contrib/fast-import/
i
mpo
r
t-zips
.
py
:
use spac
e
s inst
e
ad
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/fast-import/import-zips
.
py: fix broken
er
r
or
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agui
l
a
r
c
ontrib/fast-
i
mport: use a low
e
rcase "
u
sage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
c
o
nt
r
ib/credential: use
a
lowercas
e
"usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id A
g
u
ilar
g
it-cvsim
p
o
r
t: use a lo
w
ercase "usage:" s
t
rin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-cvsimport: use a lowercas
e
"usag
e
:" st
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguilar
g
i
t-
c
vsexportco
m
mit: use a lowercase "usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it
-
archi
m
p
ort: use a lowerca
s
e "usage:" str
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-merge-one-fi
l
e: use a lo
w
ercase
"
u
s
age:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
git-relink: use a lowercase "
u
s
a
ge:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
g
i
t
-
svn: use a lowercase "usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agui
l
ar
git-
s
h-se
t
u
p: use a low
e
rcase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t780
0
: "defaults" is
no longer a
b
u
iltin tool name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: modernize tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800
:
upda
t
e
c
opyri
g
ht
n
o
t
ice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David
A
guilar
d
iffto
o
l:
s
il
e
nc
e
uniniti
a
l
iz
e
d varia
b
le warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
A
g
uilar
p
4
merg
e
: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
Aguilar
di
f
ftool--h
e
lper: fix
p
rintf usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David
A
g
uilar
doc: gener
a
t
e a
l
ist of
valid merg
e
tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
m
ergetool--
l
i
b
: add functions for finding a
v
ailable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
avi
d
A
g
u
ilar
mergetool--lib:
improve
the h
e
l
p text in
guess_me
r
ge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
A
g
uila
r
mergetool
-
-
lib:
simplify comman
d
e
xpr
e
ss
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools:
simpl
i
fy how we handle "vim" and "
d
e
f
aults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
me
r
ge
t
ool--lib
:
improve
show_tool_h
e
lp() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
e
r
get
o
ols/vim: r
e
mov
e
redundant dif
f
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
av
i
d Ag
u
i
lar
m
ergetools/p4merge: H
o
nor $T
M
PDIR for
the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
m
e
rgetools/p4m
e
r
ge
:
Handle "/dev/null
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
D
av
i
d
A
guilar
mergetool--l
i
b:
Allo
w
custom commands
to o
v
erride buil
t
-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
uilar
gitk: Rena
m
e 'tagcontents' to 'cached_tagcont
e
nt'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid
Agui
l
ar
g
i
t
k:
Tea
c
h "
R
eread
ref
e
rence
s
"
to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
avid A
g
uilar
mergetool,difftool: Docume
n
t --tool-he
l
p c
o
nsistent
l
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
avi
d
A
guil
a
r
diff
t
ool: Disable --syml
i
nk
s
o
n
cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool
:
H
andle compare() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
difftool: Wrap long lines f
o
r readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
i
l
ar
difftoo
l
: C
h
eck all
r
eturn cod
e
s
from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
difftoo
l
: Handle finding
m
ergetools/ in a path
w
ith
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
i
l
ar
dif
f
tool: Us
e
s
ymlinks when diffing against the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difftool: Call the te
m
p directory "git-di
f
ft
o
ol"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next