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
completion: support excluding refs
2016-07-28
David Aguil
a
r
difftool:
u
se Git::* function
s
instead of passing
a
round
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguil
a
r
difftool: avoid $GIT_DIR and $
G
IT_
W
ORK_
T
REE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
subtree:
f
ix "git subtree
s
plit --r
e
join"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
D
a
vid Aguila
r
t7900-s
u
btree
.
sh: fix q
u
oting and br
o
ken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: handle unmerged files
i
n
d
i
r-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Dav
i
d Ag
u
ilar
difftool:
i
nitialize variables for readabi
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Davi
d
Aguilar
mergetool: honor tempfile configurati
o
n when res
o
l
v
ing
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Davi
d
Ag
u
ilar
mergetool: s
u
pport delete/delete conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguilar
difftool: ignore symb
o
lic lin
k
s
in use_
w
t_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Ag
u
ilar
contrib/subtree
:
ignore log
.
date configura
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mergetools: add winmerge as a builtin t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mergetool--
l
i
b
: set IFS for difftool
and merg
e
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetoo
l
s: st
o
p
settin
g
$status
i
n merge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Aguila
r
merget
o
ol:
s
i
m
p
lify
c
ondit
i
onals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
avid Aguilar
dif
f
t
o
ol--he
l
per: add explic
i
t exit statemen
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David A
g
uilar
me
r
getoo
l
--lib: remove use of
$
s
tatus
global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
D
a
vid A
g
u
ilar
difftool: honor --trust-
e
xit-code for b
u
iltin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David
Aguilar
dif
f
tool: add
support for --tr
u
st-e
x
it
-
code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
t7610-m
e
rgetool: ad
d
test cas
e
s fo
r
merg
e
tool
.
writeTo
T
emp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
m
e
r
g
etool: add an o
p
tion for wr
i
ting to
a
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergeto
o
l: u
s
e
more
conserv
a
tive temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
te
s
t-
l
i
b-func
t
ions:
a
djus
t
style to match
CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
id Aguilar
t7610
-
mergetool: use t
e
st_config to isolate
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetools/mel
d
: make
u
s
age of `--output` co
n
f
i
gurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
git-sh-se
t
up: move GI
T
_D
I
R initialization into
a
fun
c
t
i
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguil
a
r
mergetool
:
use more
c
onserv
a
tive temporary
filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
est-lib-functions: a
d
just
sty
l
e to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguila
r
t
7
6
10-mergetool: p
r
efer test_config over g
i
t
c
onfig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7
61
0
-
me
r
getool: add
m
i
s
s
i
n
g
&& and remove com
m
ented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-m
e
rg
e
tool: use tabs instead
of a mix of
t
ab
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Ag
u
ilar
completion: add --show-s
i
gnature for
l
og and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
a
v
id A
g
uilar
stash:
p
refe
r
--q
u
ie
t
o
ver shell redirection of
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
ref
s
: ma
k
e
rev-parse --quiet actually 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
Dav
i
d
A
guilar
Documentation: a no
t
e
a
bout
s
td
o
ut
f
or git
rev-pars
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
cleanups: ensure that git-co
m
pat
-
u
t
il
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
s
tylefix: ast
e
risks s
t
ick to th
e
variable, not th
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
av
i
d A
g
uilar
gitk:
Catch mkdtemp er
r
ors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguila
r
gitk:
U
se mktemp -d to avoid p
r
edict
a
ble t
e
mpora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
av
i
d A
g
uil
a
r
g
itk: Honor TMPDIR when v
i
ew
i
n
g externa
l
diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
D
avi
d
A
guilar
difftool: s
u
pport reposi
t
ori
e
s
with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pu
l
l:
a
dd --ff
-
onl
y
to the help
t
ext
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
id Aguilar
pu
l
l
:
a
dd pu
l
l
.
ff configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Dav
i
d
Aguilar
imap-send: elimina
t
e HMAC depre
c
ation w
a
rnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguil
a
r
c
ache
.
h: eliminate SHA-1
d
eprecation warnings
o
n Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Agui
l
ar
M
a
k
efile: add support for
Apple CommonCryp
t
o facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David
Aguilar
Makefile
:
fix default
r
egex settings on Darwi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Davi
d
Aguil
a
r
merget
o
ol
s
/kdiff3: do
n
ot use
-
-
auto when
d
iffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Davi
d
Aguilar
help
.
c:
a
dd a compati
b
ilit
y
comment to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Ag
u
ilar
contrib/mw-to
-
git/t/instal
l
-wiki
.
sh: u
s
e a
lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
contrib/examples/gi
t
-remote
.
perl: use a
lowerc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
te
s
ts:
us
e
a
l
owercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
a
r
git-svn: us
e
a lowercase "u
s
age:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
Documentation/user-
m
anual
.
txt: use a l
o
wercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
te
m
p
lates/hooks--upda
t
e
.
sample: use a
l
owercase "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contri
b
/
hooks/
s
etgitperms
.
perl: u
s
e
a
l
owerca
s
e
"usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/examples
:
us
e
a lowercase "u
s
age:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Aguilar
contrib/fast-import
/
impor
t
-zips
.
py:
u
se
s
pa
c
es instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contr
i
b/
f
ast-imp
o
rt/import-zips
.
py: fix b
r
oken erro
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
con
t
ri
b
/fast-imp
o
rt: use a lowercase "u
s
ag
e
:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguilar
contrib/cred
e
ntial
:
u
se a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Ag
u
ilar
git-cvsimpor
t
:
use a lowerca
s
e
"usage:"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguilar
g
i
t
-
c
v
simp
o
rt: use a lowerc
a
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-cvsex
p
or
t
commit:
u
se
a l
o
w
ercase
"
usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-arch
i
mport: use a l
o
wercase "usage:" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Aguilar
git-mer
g
e-one-file: use
a lowercase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguila
r
git-relin
k
: use a lowercase "usage
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
gi
t
-svn: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-set
u
p: use a lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800
:
"defaults" is no longer a builtin tool
n
ame
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
uilar
t7800: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David A
g
uilar
t7
8
00: update
c
op
y
r
i
ght notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
dif
f
tool:
silence
unin
i
tial
i
zed variable warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
ilar
p4me
r
g
e
: fi
x
print
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
d
ifftool--helpe
r
: fix
p
r
intf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: generate a l
i
st of valid
m
e
r
g
e
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d Aguilar
merg
e
tool--
l
ib:
add functions for finding avail
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
mergetool-
-
l
i
b: improve the help t
e
xt
in guess_
m
erge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
mergetool--lib: simplify
c
ommand expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
mergetools: simplify how we h
a
ndle "vim" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avi
d
Aguilar
merg
e
tool--lib: improve show_tool_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Agu
i
l
ar
m
e
rgetoo
l
s/vim: remo
v
e
r
edunda
n
t
d
iff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Aguilar
mergetool
s
/p4merge
:
H
onor
$TMPDIR
for t
h
e /d
e
v/nu
l
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid Aguilar
merg
e
to
o
ls/p4me
r
ge: Handle "/d
e
v/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David
A
guil
a
r
mer
g
et
o
ol-
-
lib
:
Allow custom comma
n
d
s
t
o override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id Aguilar
gitk: Rename 'tagcontent
s
'
to 'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
v
i
d
A
gui
l
ar
git
k
: Teach
"
R
er
e
ad references" to relo
a
d
t
ags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David A
g
ui
l
ar
mergetool,dif
f
t
ool:
D
o
cume
n
t --tool-help consistentl
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool:
Dis
a
b
l
e --s
y
mlinks on
c
ygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
i
l
ar
difftool: Handle compa
r
e() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
gui
l
ar
difftool: Wrap
l
o
ng lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
i
fftool: Check a
l
l return codes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
ilar
difftool: Handle finding merge
t
o
ols/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
A
guilar
difftool: U
s
e symlinks when diffing against
t
he workt
r
ee
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Agu
i
lar
diffto
o
l: Call
the temp directo
r
y
"git-difftool
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d Aguilar
d
i
fftool: Mov
e
optio
n
val
u
es
i
n
t
o a
h
a
s
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool: Eliminate global variabl
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Agu
i
lar
difftool: S
i
mplify print_tool
_
help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t
7
8
0
0: Te
s
t difftool passing
a
rguments to d
i
ff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Agu
i
lar
mergetool:
P
rovide an e
m
p
ty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next