repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: distinguish between ref and offset deltas in pack-format
2013-02-10
David Agu
i
lar
p4merg
e
: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
Agui
l
ar
diff
t
ool--hel
p
er
:
fix
printf usag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Da
v
id A
g
uilar
mergetools/
p
4merge: Honor $TMPD
I
R
fo
r
the
/d
e
v/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguila
r
merge
t
o
ols/
p
4merge: Han
d
le "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d
Aguilar
mer
g
etool--lib:
A
llow custom comm
a
nds to overr
i
de built
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rena
m
e 'tagcon
t
ents' to 'cached_ta
g
content
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
gitk: Teach "Rer
e
ad re
f
erences" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,difftool: Document --too
l
-
help co
n
sis
t
ently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
difftool: Disable --symlinks on
cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
dif
f
too
l
: Hand
l
e co
m
pare() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difftool:
W
rap lo
n
g li
n
es for
r
eadability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
difftool: Check all return codes fr
o
m compa
r
e()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agu
i
lar
diff
t
ool: Handle finding me
r
getools/
i
n a pa
t
h with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
di
f
fto
o
l: Use symlinks
w
hen diffin
g
again
s
t th
e
workt
r
e
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguila
r
difft
o
o
l
:
C
al
l
the
temp directory "gi
t
-difftoo
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
a
r
difftoo
l
: Mov
e
o
ptio
n
valu
e
s in
t
o a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool:
Elimi
n
a
t
e
g
lobal va
r
iables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difft
o
ol:
S
impli
f
y print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Ag
u
ilar
t780
0
:
T
est diff
t
ool passing arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Aguilar
mergetool: P
r
ovide an
empty file when need
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Ag
u
ilar
Mak
e
file:
I
mprove comp
i
ler head
e
r
dependency
c
heck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
mergetools/
m
eld: Use '--output' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d
Aguilar
merge
t
oo
l
--lib: Refactor too
l
s
into sep
a
rate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
m
e
rgetool--lib: M
a
ke
s
ty
l
e consist
e
nt with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
d
i
ff
t
oo
l
--helper: Make styl
e
consistent with
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t
7
503-
p
re-commit-hook
.
sh:
Add GIT_PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
git-mer
g
etool--lib:
Make vimd
i
f
f retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
g
uilar
git:
Remove handling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
id Aguilar
setup: Provide GIT_PR
E
FIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
s
ubmodule sync: Update "s
u
b
m
od
u
le
.
<
n
ame>
.
url
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David
A
guilar
merge
t
ool:
Skip autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Aguilar
Document
a
ti
o
n: Explain
g
it-m
e
rgetoo
l
's
u
se of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Remove us
a
g
e of deprecated Pyth
o
n "h
a
s
_
key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Aguilar
difftoo
l
: Fix
'--
g
ui' when
d
iff
.
gui
t
ool is
u
nconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-di
f
f
tool
.
sh:
T
est mer
g
etool
.
prompt
f
allb
a
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
i
fftool: U
p
d
ate
copy
r
ight notices to list
ea
c
h y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
g
uilar
diff
t
ool: Use eval to
e
x
pan
d
'--extcmd' ex
p
re
s
sions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
d
ifftool:
Add '-x' a
n
d
as an
alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
t
7
800-difftoo
l
.
sh: Simplify the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Ag
u
ilar
git-di
f
f
.
txt: Link
t
o git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
d
ifftool: All
o
w speci
f
ying unco
n
fig
u
red commands wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftoo
l
--helper: Remove use o
f
the GIT_ME
R
GE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
di
f
ftoo
l
--he
l
per: Upd
a
t
e
copyright an
d
remo
v
e di
s
t
racting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
uilar
git-dif
f
t
o
o
l: Add '--gui' for s
e
le
c
ting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
A
g
uilar
t
7
800-difftool: Se
t
a bogus too
l
f
o
r
use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguil
a
r
help:
Do n
o
t unnece
s
sarily loo
k
f
or a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id
Aguilar
submodule
.
c: Sque
l
ch
a
"
u
s
e bef
o
r
e
a
s
s
ig
n
ment"
w
a
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Agui
l
ar
dif
f
: gen
e
ra
t
e pretty fi
l
e
n
ames in prep_temp
_
blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
uilar
co
m
pat: add a basename() compat
i
bility fun
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
c
o
mpat: add
a mkstemps() c
o
mpatibilit
y
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
A
dd git-rep
l
ace
to
.
gitig
n
ore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id
Aguila
r
mergetool--lib: add support fo
r
araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Davi
d
Aguilar
mergetoo
l
--lib: specialize diff opt
i
ons for eme
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mer
g
etool--lib: simplify API usa
g
e by re
m
oving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Ag
u
ilar
diff
t
ool/mer
g
etool: refactor command
s
t
o
use git-merge
t
ool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
me
r
getool: use $(
.
.
.
) instea
d
o
f
`backtick
s
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agu
i
la
r
b
ash
complet
i
on: add git-
d
ifftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool: add support for a difftool
.
pr
o
mpt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
diff
t
o
o
l: add vari
o
us gi
t
-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: move 'git-difftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
di
f
ft
o
ol: ad
d
a
-y shortcut fo
r
--no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: use per
l
built-ins when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
gu
i
lar
difftool: remove
t
he backup
f
il
e
feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: remove merge option
s
for opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
e
v
er
y
day: use
t
h
e
dashless
form
of git-in
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguila
r
contrib/difftool: use a separate config
n
ame
s
pace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
a
v
i
d
A
guilar
contri
b
/difftool: Don't r
e
p
e
at merge tool can
d
idates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
A
g
ui
l
ar
difftool:
p
ut th
e
cursor on the editable file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Ag
u
ilar
difftool: fix docum
e
ntation pro
b
le
m
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
avi
d
Agu
i
lar
contrib: add 'git difftool' for laun
c
hing
common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool:
properly handle "git mergetool -- filename
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d Aguil
a
r
t
e
sts:
a
d
d
a
testcase fo
r
"
g
it submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David
A
gui
l
a
r
git-submodule: add "sync
"
com
m
and
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David
Aguilar
g
it-su
b
m
o
dule:
r
eplace du
p
licated co
d
e with a
mo
d
ule_
l
ist
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguila
r
[
P
AT
C
H] gitk: Don't sh
o
w local chan
g
es when we ther
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree