repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: Add '-x' and as an alias for '--extcmd'
2010-01-15
Dav
i
d
Aguila
r
d
if
f
tool:
Add '
-
x' and
a
s
an ali
a
s fo
r
'--extcmd'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
t7800-difftool
.
s
h: S
i
mp
l
ify
t
h
e
-
-extcmd te
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guila
r
git-diff
.
txt: Link to git
-
difftool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Ag
u
ilar
difftool: Allow specifyi
n
g
unconf
i
g
u
red comma
n
ds
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
d
i
f
ft
o
ol-
-
h
elper: Remove use of the GIT_MERGE_T
O
O
L
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
A
g
uilar
d
ifftool--
h
elper: Update copyright and
r
e
move d
i
stracting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
g
u
il
a
r
git-di
f
ftool: Add '--gu
i
' for selecting
a
GUI too
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
a
r
t7800-diff
t
o
o
l: Set a b
o
gus tool for
u
se by tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
J
u
n
i
o C Hamano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Ham
a
n
o
M
e
rge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
Preven
t
git
b
lame from s
e
g
fau
l
ting on a missing author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Git 1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
Ha
m
ano
Merge
branch
'maint'
commit
|
commitdiff
|
tree
2009-12-20
Björn Gustavsson
rebase -i:
a
bort clean
l
y if the ed
i
t
or f
a
ils
to launch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Step
h
en Boyd
technical-docs: docume
n
t hash
A
P
I
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
St
e
p
h
en Boyd
api-str
b
uf
.
t
x
t: fix typos and do
c
ument
launc
h
_
e
ditor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C
H
ama
n
o
Merge
b
ranch 'maint' to
s
ync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
worktree: don't
segfault with an ab
s
olute
paths
p
ec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Je
f
f King
i
gnore un
k
nown col
o
r c
o
nf
i
guratio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johannes Sixt
help
.
autocorre
c
t
:
d
o not run a command
if the c
o
mmand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
N
a
nako
Sh
i
rais
h
i
I
l
l
ustrate "filter" attribute with an
e
xample
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Björn Gust
a
vss
o
n
bash: Support new 'git
f
e
t
c
h
' opt
i
on
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio C Hama
n
o
U
p
date R
e
le
a
se
N
otes for 1
.
6
.
6 to
remo
v
e
old bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Haman
o
Sync with
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
man
o
G
it 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C
Ham
a
no
Fix arch
i
ve fo
r
mat
w
ith -- on t
h
e command line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
man
o
R
e
m
o
ve pos
t
-
u
pload
-
ho
o
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o
C Hamano
G
it 1
.
6
.
6-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
M
e
r
g
e git://repo
.
or
.
cz/git-gu
i
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://git
.
kernel
.
org/pu
b
/
sc
m
/
gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Updat
e
draft re
l
e
a
se notes to 1
.
6
.
6
before
-
rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C
Ha
m
an
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
Merge branch 'm
m
/mai
n
t
-merge-ff-error-mess
a
g
e
-
fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io
C
Hamano
Merge branch 'jn/m
a
i
n
t-pu
l
l-rebase-error-message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Hama
n
o
Mer
g
e
b
r
anch 'jk/maint-add-p
-
delete-fi
x
' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git:/
/
git
.
b
o
gomip
s
.
org/
g
it-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio
C Hamano
Revert r
e
c
ent "git m
e
rge <m
s
g>
H
E
A
D <commit>
.
.
.
" deprecati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
Jeff Kin
g
a
dd-interactive: fi
x
de
l
etion of non-empty file
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
SZ
E
DER Gábor
b
ash
:
update 'git
c
ommit' co
m
pletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Syn
c
with 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
u
n
io C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torv
a
lds
F
ix diff
-
B
/
--
d
irsta
t
miscounting of newly a
d
ded contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Je
f
f King
reset: improve worktree safety valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd
Z
ullinger
D
o
cumen
t
a
tion: Avoi
d
u
s
e
of xmlto --stringpa
r
am
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René Schar
f
e
archive: clarify
de
s
cription of pa
t
h param
e
t
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff
K
i
n
g
r
erere:
d
o
n't segf
a
ult o
n
failure to ope
n
rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Haman
o
Me
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Prepare for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch
'
uk/ma
i
nt-sho
r
tlog-encoding' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branc
h
'fc/
m
a
i
nt-f
o
rmat-patch-pathspec
-
d
a
s
hes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
m
ano
Merge bra
n
ch 'ap/maint-merge-strat
e
g
y
-list-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'jc/maint-am-keep' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Hamano
Me
r
ge
b
ranch 'rs/work-a
r
ound-grep-opt-insanit
y
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C H
a
man
o
M
e
r
g
e
b
r
anch '
r
j/ma
i
nt-c
y
g
w
in-co
u
n
t
-
ob
j
ects' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Haman
o
Merge branch 'mm/main
t
-hi
n
t-
f
ailed-merge'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
b
r
a
nch 'th/mai
n
t-r
e
mote-
u
p
d
at
e
-hel
p
-
string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge branch 'rj/maint-t9
7
00'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch 'ls/m
a
int-ma
i
l
info
-
n
o
-i
n
body' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
M
e
rge branch 'mo/m
a
int-c
r
lf-doc'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Ha
m
ano
Merge br
a
nch 'th/remote-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch
'pb/
m
aint-use-custom-p
e
rl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
r
a
nch 'm
m
/con
f
ig
-
pathname-
t
ilde-ex
p
and' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Ham
a
no
M
erge branch 'b
c
/
g
rep
-
i-
F
' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C H
a
m
ano
M
e
rge branch 'jk
/
mai
n
t-bre
a
k-
r
ename-reduce-m
e
mory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
ch 'rj/maint
-
s
i
mplify
-
c
y
gwin-makefile'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'rg/doc-
w
orkflow'
into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch 'np/maint
-
sideband-favor-stat
u
s
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
a
kub Narebski
g
i
tweb: Des
c
ribe (possible) gitwe
b
.
js
minification
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Documentatio
n
: xmlto 0
.
0
.
18 d
o
e
s not know -
-
st
r
ingpa
r
am
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Johan He
r
land
Fix crashe
r
o
n
encounte
r
in
g
S
HA1-
l
ik
e
no
n
-note in no
t
es
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Br
a
ndon Casey
t9001: use older Getopt::Long b
o
ol
e
an prefix '--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t4201: use ISO
8
859-1
rather than ISO-8859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan
K
rüger
pull: clarify advic
e
for the un
c
o
n
figured
e
rror case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
amano
Unconditio
n
all
y
set ma
n
.
base
.
url
.
f
o
r
.
relative
.
link
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
Git
1
.
6
.
6
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
v
o
n Brand
git-pull
.
sh
:
Fix
call to git-merge fo
r
new command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
an
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prepare for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C
Hamano
mer
g
e:
d
o not add standard me
s
sage wh
e
n message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Hamano
Do
n
o
t
misidentify "git
m
e
r
g
e
f
oo H
E
AD" as an old-s
t
yle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
U
p
d
a
te draft rel
e
a
s
e notes to 1
.
6
.
6 before
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C
H
amano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge bran
c
h
'
jc
/
dep
r
ec
a
te-old-syn
t
ax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
mano
git-merge
:
a deprecation notice of the an
c
ient com
m
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C
Hamano
Mer
g
e branch 'b
w
/
r
emote-get-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert W
e
s
a
rg
get_ref_stat
e
s: strdup entries and f
r
ee
util in stale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
av
i
d
A
guila
r
help: Do not unnecessaril
y
look for a r
e
posi
t
ory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
Doc
u
men
t
a
tion: Fix
a fe
w
i
.
e
.
/e
.
g
.
mix-
u
ps
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Me
r
ge branch 'jn/gitw
e
b-blame'
commit
|
commitdiff
|
tree
2009-12-01
Jakub
N
areb
s
ki
gitweb: Add link to oth
e
r blame impl
e
mentation i
n
bla
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jakub Narebski
gitweb: Make linki
n
g to a
c
t
ions requiring JavaSc
r
ipt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'fc/ma
i
nt-format-patch-pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Merge branch 'mm/maint-me
r
g
e
-
ff
-
error-m
e
ssage-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch
'
ap
/
maint-merge-strategy
-
l
i
st-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Merge branch 'jc
/
pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Ha
m
a
no
Merge
b
ranch 'cc/bis
e
ct-doc'
commit
|
commitdiff
|
tree
next