repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
2016-12-12
Da
v
id Aguilar
mergetools: fix xxdif
f
hotkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
Davi
d
A
gui
l
ar
d
ifftool: fix
d
ir
-
dif
f
i
n
d
ex creation when in a
subdire
c
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David
A
gui
l
a
r
me
r
getoo
l
s/vimdif
f
: tr
u
st Vim's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
D
a
vid
A
guilar
mergetool: h
o
nor mer
g
etoo
l
.
$
t
ool
.
t
r
u
s
t
ExitCode for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
me
r
getool: honor -O<orderfi
l
e>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
A
g
u
il
a
r
me
r
getool:
hono
r
diff
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
v
id Aguilar
mergetool:
m
ove main progra
m
flow into
a
main() function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
erg
e
tool
:
add c
o
p
y
ri
g
ht
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
di
f
ft
o
ol: use G
i
t:
:
* functions
i
nstead of passi
n
g
arou
n
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
a
vid Aguilar
difftool: avoid
$GIT
_
DIR a
n
d $GIT
_
WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
subtree:
a
d
ju
s
t function d
e
fin
i
t
ions to mat
c
h C
o
ding
G
uidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Da
v
id Aguilar
subtree: adjust
style t
o
match CodingGui
d
el
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
D
a
vi
d
Agui
l
ar
s
ubt
r
ee: fix "git subt
r
ee
s
plit
-
-rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Davi
d
Ag
u
ilar
t
7
9
0
0
-su
b
tree
.
sh:
f
ix quot
i
ng and bro
k
en && ch
a
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Agui
l
ar
d
i
fftool: handle unmerged
files in dir-di
f
f mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Da
v
id
Aguila
r
difftool: initia
l
iz
e
variables for read
a
bilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
avid Aguilar
merge
t
o
o
l: honor tempfile configura
t
ion
w
hen
re
s
o
l
ving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
avi
d
Ag
u
ilar
m
ergetool: sup
p
o
rt delete/delete con
f
licts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
D
a
vid Aguila
r
difftool: ignore s
y
m
bo
l
i
c
links in use_wt_
f
ile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David A
g
uilar
c
o
n
trib/subt
r
ee: ignore log
.
d
ate configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
avi
d
Agu
i
lar
me
r
getoo
l
s:
a
d
d
w
i
n
merge as a builtin
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
a
v
i
d Aguilar
merge
t
o
ol
-
-
lib: set IF
S
f
o
r difftool and mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
guilar
mergetools: stop setting $s
t
atus in m
e
rge_c
m
d()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Agu
i
lar
me
r
getool: simplify conditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
difft
o
o
l
--helper
:
add
e
x
plicit exit statem
e
n
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguil
a
r
merget
o
ol--lib: remove use of $status gl
o
ba
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
difftool: hon
o
r
-
-
trust-exit-code f
o
r
built
i
n tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David A
g
uilar
difftool: add s
u
pport for --trust
-
exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-merg
e
t
ool: add
test cas
e
s
for mergetool
.
writeT
o
T
emp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
mergetool: add an o
p
tion for writin
g
to a
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
ar
mergetool: use m
o
re c
o
nservative te
m
p
orary
filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid
Aguilar
test
-
lib-fu
n
c
tio
n
s: adjust style to
match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-me
r
g
e
too
l
: use test_config to
i
solate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguil
a
r
m
er
g
etools/m
e
ld: ma
k
e usage of `--
o
utput` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guil
a
r
git-
s
h-
s
etup:
m
ove
GIT_
D
IR initialization
into a fun
c
ti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
mergetool: use more conservat
i
ve temporary filen
a
mes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
la
r
te
s
t-
l
i
b-functions: adju
s
t style to ma
t
ch CodingG
u
i
d
e
lin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetoo
l
: prefer test_config over git
c
o
nfig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
t761
0
-mergetool: add mis
s
i
ng && and remove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool:
use tabs
i
nst
e
a
d
of a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David A
g
uilar
c
omple
t
io
n
: add --s
h
ow-signature for
l
o
g and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Aguil
a
r
sta
s
h: prefer --
q
uiet over s
h
ell redirection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Aguilar
refs: make
r
ev-p
a
rs
e
-
-q
u
iet act
u
al
l
y quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David
A
guilar
t150
3
: use test_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Document
a
tion: a note abo
u
t stdout
f
o
r git
rev
-
parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
c
leanups: ensure
t
hat git-com
p
at-
u
til
.
h i
s
inc
l
uded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
stylefix
:
asteris
k
s stick to
the variable,
n
ot the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
g
itk: Catch
m
kdtemp
err
o
rs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguil
a
r
git
k
: Use
m
ktemp -d to av
o
id p
r
edictable tempor
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Honor TMPDIR when viewing external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David A
g
uilar
difftool: s
u
p
p
o
r
t reposi
t
o
r
ies with
.
git-file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pu
l
l: add --ff-only to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Davi
d
Aguilar
pul
l
:
a
d
d pull
.
ff configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vid Ag
u
ilar
imap-send: eli
m
i
nate HMAC deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid Aguilar
cache
.
h: eli
m
ina
t
e S
H
A-1 depreca
t
ion war
n
ings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
id
A
guilar
Make
f
ile: add suppor
t
for App
l
e CommonC
r
ypto facil
i
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Dav
i
d
A
gu
i
lar
M
a
kefile: f
i
x default regex sett
i
ngs on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Agui
l
ar
merget
o
ols/kdiff3:
d
o
not use --auto when diffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vid
A
guilar
help
.
c: add a compatibi
l
ity comment to
cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
contrib/mw-to-git/t/install-wiki
.
s
h
: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id Aguila
r
contrib/e
x
amples/git-remot
e
.
pe
r
l: us
e
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguila
r
tests
:
use a lowe
r
c
a
se "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
git
-
svn:
u
se a
lowerca
s
e "us
a
g
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
Documentation/us
e
r-manual
.
txt: use
a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
templates/h
o
oks--upd
a
te
.
sa
m
ple: us
e
a
l
owercase "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id A
g
uilar
c
ontr
i
b/hooks
/
set
g
i
tperms
.
per
l
: u
s
e
a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
contrib/exam
p
les: u
s
e
a lowercas
e
"usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contr
i
b/
f
ast
-
imp
o
rt/i
m
por
t
-zi
p
s
.
py: use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib
/
fast-i
m
p
ort/import-zips
.
py: fi
x
broken err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id A
g
uila
r
contrib/fas
t
-import: u
s
e
a lowe
r
case
"
usage
:
" st
r
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/cr
e
den
t
ial:
use a lower
c
ase "
u
sage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git
-
cvsimport:
u
se
a lowercase "usage:"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-cvsimport: u
s
e a lowercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
g
i
t-cv
s
exportcommit:
use a l
o
wer
c
ase
"
usage:"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-
a
rchi
m
port: use a lowercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
guilar
git-merge-one-f
i
l
e: use a
lo
w
ercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-reli
n
k:
u
se
a
lowe
r
ca
s
e "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-svn
:
use a lowerca
s
e "usa
g
e:
"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uil
a
r
git-sh-setup: use a lowerca
s
e "
u
s
ag
e
:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Ag
u
ilar
t780
0
: "defaul
t
s"
i
s
no longer a builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid Ag
u
ilar
t7800: modernize
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: update c
o
pyright n
o
ti
c
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool:
silen
c
e uninitialized
v
ariabl
e
w
a
r
n
in
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
id
Agu
i
lar
p4merge: fix printf
u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguilar
dif
f
tool--helper: fix pr
i
ntf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d
Aguilar
d
o
c
:
g
e
n
e
r
a
te a list o
f
valid merge
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ilar
m
erget
o
o
l
-
-lib: add funct
i
o
n
s for finding availa
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
il
a
r
mergetool--lib: i
m
prove
t
he
h
e
lp t
e
x
t in g
u
es
s
_
m
erge_too
l
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
mergeto
o
l--lib:
s
i
mplify command
e
xpre
s
sions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
g
u
i
lar
mergetools: s
i
mplify
how we handl
e
"vim"
a
nd "defaults
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguilar
mergetool--
l
ib: impro
v
e show_tool_hel
p
() o
u
t
put
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
Da
v
id
A
gu
i
lar
mergetools/
p
4merge
:
Hon
o
r
$
TMPDIR for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguil
a
r
merg
e
tools/p4merge: Handl
e
"/
d
ev/
n
ull"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
a
vid
A
guilar
me
r
getool--lib: Allow 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
gitk:
R
ename 'tag
c
onte
n
t
s
' to 'cached_
t
agcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach "Reread references"
to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David
A
g
uilar
mergeto
o
l,d
i
fft
o
o
l: Do
c
u
m
ent -
-
tool-
h
el
p
consis
t
ently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
d
ifftool:
Disable --s
y
mlin
k
s o
n
c
y
g
wi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Handle
c
om
p
are() returni
n
g -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next