repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Split over-long synopsis in git-fetch-pack.txt into several lines
2012-09-25
David Agu
i
lar
mer
g
e
t
ool--lib
:
Allow
cu
s
tom commands t
o
over
r
i
d
e built
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
A
g
uilar
gitk: Re
n
am
e
'tagcontents' t
o
'cac
h
ed_
t
a
gc
o
ntent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
g
itk: Teach "
R
er
e
ad re
f
e
r
ences
"
to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David A
g
uilar
mergetoo
l
,di
f
ftoo
l
: Document -
-
tool-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d
Aguilar
d
i
f
ftool:
Disable --
s
ymlinks
on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
l
a
r
difftool: Ha
n
d
l
e co
m
pare()
returnin
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
difftool:
W
ra
p
long
lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
d
i
f
f
t
o
ol: Check all
return
cod
e
s fro
m
c
o
mpare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
v
i
d
Aguilar
difftool:
Handle find
i
ng mergetools/ in
a
path
w
i
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool: Use symlinks when diffi
n
g against
the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
d
i
f
f
tool:
Call the temp dir
e
c
t
o
ry "git-diff
t
ool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
A
guila
r
diff
t
o
ol: Move op
t
ion va
l
ues into a
has
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid
Agu
i
l
ar
dif
f
tool: Elimin
a
te global
v
a
riables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
a
r
d
if
f
tool
:
Sim
p
lify
p
rint_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t
7
800: Tes
t
di
f
ftool passing argume
n
ts to
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David
Aguilar
mer
g
et
o
ol:
Provide
a
n e
m
pty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David A
g
uilar
M
akefil
e
: Improve compiler header depende
n
cy che
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mergetools/
m
eld:
Use '-
-
output'
when avail
a
ble
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
merg
e
tool-
-
l
ib: Refactor
t
o
ols
into separate
f
ile
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merget
o
ol--lib:
Ma
k
e style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Agui
l
ar
dif
f
too
l
--helper: Make s
t
yle con
s
istent w
i
th g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David A
g
uilar
t
/t7503-pre
-
commit-h
o
ok
.
sh: Add GIT_PR
E
F
I
X
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
git
-
mergeto
o
l--lib: Make vi
m
diff ret
a
i
n
the
c
u
rre
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ila
r
g
i
t:
R
emove handl
i
ng for GIT_PREF
I
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
a
r
setup: Provide GIT_PREFIX
t
o
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d Aguila
r
submodu
l
e
syn
c
: Update "submodule
.
<
name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguila
r
mergetool: Skip auto
r
es
o
lv
e
d
paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id
A
guilar
Documen
t
ati
o
n: Explain git-me
r
getool's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Aguilar
Makefile:
Remove
u
s
a
ge of dep
r
ecat
e
d P
y
th
o
n "has_ke
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Aguila
r
d
iffto
o
l: Fix
'--gui' when diff
.
g
u
i
t
o
o
l
i
s
u
nconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
avid Aguilar
t780
0
-difftool
.
s
h
:
T
est mer
g
e
t
o
ol
.
prompt fallb
a
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id Aguilar
difftool:
Upda
t
e copyright notices
to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
difftool: Use eval to expand '--extcmd' exp
r
ess
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Agu
i
la
r
difftool
:
Add
'
-x'
a
nd
as
an alias for
'
--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
t780
0
-difftool
.
s
h
:
Simplify the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Agu
i
la
r
gi
t
-
d
iff
.
txt: Link t
o
git-diffto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diff
t
ool
:
A
l
low speci
f
yi
n
g uncon
f
igured co
m
ma
n
ds with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
diff
t
ool--helper: Remove u
s
e of the GIT_M
E
RGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--hel
p
er: Upda
t
e cop
y
right
a
nd re
m
ove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Ag
u
ilar
git-diffto
o
l: Add '--gui' for sele
c
tin
g
a
G
UI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
t
7
800-difft
o
ol: Set a bog
u
s t
o
ol fo
r
use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid A
g
u
il
a
r
help:
D
o not unnecessarily
l
ook for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
sub
m
odule
.
c: Squelch a "u
s
e before assignment
"
w
a
rn
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguila
r
diff:
g
enerate pretty filenames in prep_te
m
p_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
id Aguila
r
com
p
at:
add
a
b
a
senam
e
(
)
comp
a
t
i
b
i
li
t
y function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
compat:
a
dd a mkstemp
s
() compatibility fu
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Ag
u
ilar
Add git-replace t
o
.
git
i
gnore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergeto
o
l--lib: add
s
uppo
r
t for araxis
m
e
rge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid Aguilar
mergetool--li
b
: spec
i
al
i
ze diff
o
ptions for
e
merg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id Aguilar
mergeto
o
l
-
-lib: si
m
plify API u
s
age
b
y removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
l
ar
difftool/merget
o
o
l: re
f
actor com
m
ands to use g
i
t-me
r
getool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
guilar
merg
e
too
l
:
use $(
.
.
.
) ins
t
ead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completion: add g
i
t-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
diff
t
ool
:
add
s
upport for a difftool
.
p
r
ompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add
various git-difft
o
ol tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol: m
o
ve
'git-di
f
ftool' out
o
f co
n
trib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
diffto
o
l: add a -y sh
o
r
tcut for --n
o
-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguil
a
r
di
f
ftool: use pe
r
l
buil
t
-in
s
w
h
e
n
testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Ag
u
ilar
difftool
:
remove
t
he backu
p
file fe
a
ture
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
la
r
diffto
o
l
:
remove
merge
o
p
tions for opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Agu
i
lar
eve
r
yday: use
t
he dashless form of
gi
t
-i
n
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/difftoo
l
:
u
se a
s
eparate con
f
ig na
m
espace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Ag
u
ilar
contrib/diffto
o
l:
Don't
r
e
pe
a
t merge
t
ool
c
andidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Agui
l
ar
difftoo
l
: put
t
h
e
c
ursor on t
h
e e
d
itabl
e
file for
V
im
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
A
guil
a
r
difftool: fix documentation probl
e
ms
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
Aguilar
c
ontr
i
b: ad
d
'git diff
t
ool' for
l
a
unchin
g
common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David
Aguilar
g
i
t
-mergetool: prope
r
ly handle "git
m
e
rge
t
ool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests
:
add a test
c
ase for "git submodul
e
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Davi
d
A
g
uilar
git-submo
d
ule: add "syn
c
" comman
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Agu
i
la
r
git-s
u
b
m
o
d
u
le:
r
eplac
e
du
p
l
i
cate
d
code with a
module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Agu
i
lar
[PATCH] gitk: Don't show local
changes whe
n
we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree