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
difftool: support repositories with .git-files
2014-02-24
David A
g
u
ilar
diffto
o
l: sup
p
ort
r
epositorie
s
w
i
th
.
gi
t
-files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
D
a
v
i
d
Agui
l
ar
imap-send: el
i
min
a
te HMAC deprecatio
n
w
a
r
n
ings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Aguilar
cache
.
h: eliminate SHA-1
deprecation w
a
rnin
g
s on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Agui
l
ar
Ma
k
efi
l
e
:
add
support
f
o
r App
l
e CommonCrypto facility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
D
a
v
i
d
Aguilar
Makefile
:
f
i
x default regex settings
o
n
Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David
Agui
l
ar
mergetools/kdif
f
3: do not use --auto when diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c: add
a
compat
i
bility comment to cmd_version()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
co
n
trib/mw-to-git/t/in
s
ta
l
l
-wiki
.
sh: use a l
o
w
e
rca
s
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contr
i
b/ex
a
mples/git-r
e
mote
.
pe
r
l: use a lowerca
s
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
u
ilar
tests: use
a
l
owerca
s
e "usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
avid
Aguilar
git
-
s
v
n: use a lowercase "u
s
age:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d A
g
uilar
Documentati
o
n/user-manual
.
t
x
t: use a lowercase
"
usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
templates/hooks--
u
pda
t
e
.
sample: us
e
a low
e
rcase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
trib
/
h
o
ok
s
/setgitperms
.
per
l
: use a lowe
r
case
"usag
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/e
x
a
mples: use
a
l
o
wercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/f
a
s
t-import/
i
mpor
t
-zips
.
py
:
use spaces
in
s
tead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
ntrib/
f
as
t
-imp
o
rt
/
import-zi
p
s
.
py: fix bro
k
en e
r
ror
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Ag
u
ilar
contr
i
b/fast-import: use
a lower
c
ase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
contr
i
b/creden
t
ial: u
s
e a low
e
rcase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guila
r
git-cvsimp
o
rt: use
a lowercase "usage:" st
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguila
r
git-cv
s
import
:
use a
lowercase "
u
sage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agui
l
a
r
g
it-cvse
x
portc
o
m
m
it: use a
l
owerca
s
e
"usag
e
:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-a
r
chimpor
t
: use a lowercase "us
a
ge:
"
str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
ar
git-merge-on
e
-file: use a lowerca
s
e "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-re
l
ink:
us
e
a
lowercase "usage:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Aguilar
git-s
v
n: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agu
i
lar
git-sh-setup: use a lowercase "usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Aguilar
t7800: "def
a
ul
t
s
"
is n
o
lo
n
ger a builtin
tool name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David
A
guilar
t
7800: modernize te
s
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
D
avid Aguilar
t
7
800: update copyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
d
i
fftool: si
l
ence unin
i
tialized v
a
riable warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguil
a
r
p
4
merge: fix pri
n
t
f usa
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguilar
diffto
o
l--helper: fix pr
i
nt
f
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: generate
a
list of valid mer
g
e tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguila
r
merget
o
ol--l
i
b:
add functions for f
i
nd
i
ng a
v
a
i
lable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
ergetool--
l
ib:
improve th
e
hel
p
t
e
xt in guess_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id A
g
uila
r
mergetool--li
b
: simplify co
m
m
a
n
d
exp
r
ess
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguila
r
mer
g
etools: simpl
i
fy how we
h
a
n
d
le "vim" and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id Agui
l
ar
mergetool--lib: impro
v
e show_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
m
e
r
g
e
too
l
s
/vim: remove red
u
ndant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mergetools/p4merge
:
Hono
r
$
TMPDIR for the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Agu
i
l
a
r
mergetools/p4me
r
ge: Handl
e
"/d
e
v
/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
D
a
vid Aguilar
merg
e
t
ool--l
i
b: A
l
low custom
c
omm
a
nd
s
to
overri
d
e
built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
uilar
g
i
t
k: Rena
m
e
'tagconte
n
ts
'
to 'cached_ta
g
c
ontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
gitk: Teach "
R
eread references" to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
merge
t
ool,dif
f
to
o
l
:
Document --tool-help
co
n
sistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
difftool: Disable
-
-
s
y
m
links on
c
y
g
win
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vi
d
A
g
u
i
la
r
diff
t
oo
l
: Handle compare()
r
e
t
urning
-
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguil
a
r
dif
f
tool: Wrap lo
n
g lines for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguila
r
difft
o
ol:
C
heck a
l
l r
e
turn codes from co
m
par
e
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Handle
f
inding
mergetoo
l
s/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Agu
i
l
ar
difftool: Use sym
l
ink
s
when d
i
ffing against the
worktr
e
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguil
a
r
diffto
o
l: C
a
ll th
e
t
emp directory "git-difft
o
o
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool: Move opt
i
on values into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
if
f
tool:
Eliminate global
variable
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
gu
i
lar
difftool: Simplify prin
t
_tool_he
l
p()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Te
s
t difftool passing argum
e
nts to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Ag
u
ilar
mergeto
o
l
:
Provide an empt
y
f
ile
when need
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makef
i
le: Im
p
rove compiler hea
d
er depen
d
en
c
y ch
e
ck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
v
id A
g
ui
l
ar
mergetools/mel
d
: U
s
e '--output' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
ergetool--l
i
b
: Refactor tools
in
t
o s
e
para
t
e files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
mergetool--lib:
Make st
y
le consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
diffto
o
l
-
-helper: M
a
ke sty
l
e cons
i
s
tent with
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/
t
750
3
-pre
-
commit-hook
.
sh: Add GIT_PREF
I
X tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
gi
t
-merge
t
oo
l
--lib: M
a
ke
v
imdi
f
f retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
i
lar
g
i
t: Remove
h
andling for
G
I
T
_PREFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
s
e
tup: Provide GI
T
_P
R
E
F
IX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync:
Upd
a
te "submodule
.
<
nam
e
>
.
u
rl"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Sk
i
p autoresolve
d
paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d Aguilar
Doc
u
mentation: Explai
n
git-merget
o
ol's us
e
of t
e
mporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
Agu
i
lar
Makefile
:
Remove
u
sage of d
e
precated Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguila
r
diffto
o
l:
Fix '
-
-gui'
when diff
.
gui
t
o
o
l is
u
nconf
i
gured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Ag
u
ilar
t7800-difftool
.
s
h
: Test mergetool
.
p
r
o
m
pt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
i
fftool:
U
pd
a
t
e
copyright noti
c
es to list each
year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
difftool:
U
se eva
l
to expand '--
e
x
tcmd' e
x
pr
e
ssio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
diffto
o
l: Add '-
x
' an
d
as a
n
alias for '
-
-extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
A
g
uilar
t7800-difftool
.
sh:
Simplify the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
gi
t
-diff
.
t
x
t: Link to git-dif
f
t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Aguilar
difftool:
A
llow specifyi
n
g unconfigured commands wit
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
di
f
ftool--hel
p
er: Remove use of the
GIT_MERGE_TO
O
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Agu
i
lar
difftool--helper: Up
d
ate
copyri
g
h
t and remove di
s
tracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
u
ilar
git-d
i
fftool: A
d
d '--gui' for selecting a GUI
to
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
lar
t7800-difftool: S
e
t a
bogus t
o
ol for use by
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David A
g
uilar
help:
Do not unnecessarily look for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid Aguilar
submodule
.
c: Squelch a "use before assignment"
warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Ag
u
ila
r
diff: generate
pretty fi
l
enames in pre
p
_temp
_
bl
o
b(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a basename() compatib
i
lity function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
A
gu
i
lar
c
ompat: add a mk
s
t
e
mps()
c
o
m
patibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid A
g
uilar
Add g
i
t-replace to
.
gitig
n
o
re
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David A
g
ui
l
ar
merge
t
ool--lib: add supp
o
rt for araxis mer
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguila
r
mer
g
etool--li
b
:
s
pecialize diff op
t
ions for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
merg
e
to
o
l--lib: simp
l
i
f
y API usage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Agui
l
ar
difftool/mergetool: refactor com
m
ands to
use g
i
t-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
mergetool: use $(
.
.
.
) inst
e
ad
of `backtic
k
s`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
bash completion: add
git
-
di
f
ftoo
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
dif
f
too
l
: add support for a difftool
.
p
rompt co
n
fig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add various git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool: move 'git-d
i
ffto
o
l' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftoo
l
:
add
a
-y shortcut for
--n
o
-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
gui
l
ar
difftool: use
perl built
-
ins when
testing for
m
s
y
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next