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
Merge branch 'jk/cobdoc'
2009-04-18
J
unio C Hamano
Merge br
a
n
ch 'jk/cobdoc'
commit
|
commitdiff
|
tree
2009-04-18
Jun
i
o C Ha
m
an
o
Merge br
a
nch 'mk/apply-sw
a
p'
commit
|
commitdiff
|
tree
2009-04-18
Juni
o
C
H
amano
Merge branch
'
mm/add-p-qui
t
'
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Merge branch 'eb/
u
pload-
a
rch
i
ve-from-git-she
l
l
'
commit
|
commitdiff
|
tree
2009-04-18
Junio
C
H
a
mano
M
erge bra
n
ch 'jc
/
shar
e
d-lite
r
ally'
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Merge
branch '
n
s
/am-to-
e
m
p
ty'
commit
|
commitdiff
|
tree
2009-04-18
Junio C Haman
o
M
e
rge branc
h
'bw/short-ref-s
t
rict'
commit
|
commitdiff
|
tree
2009-04-18
Juni
o
C Hamano
Merge branch
'da/difftool
'
commit
|
commitdiff
|
tree
2009-04-18
J
u
nio
C
Hamano
Merge
bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2009-04-18
Jeff Ki
n
g
doc/gitattri
b
ute
s
: clari
f
y
l
ocatio
n
of config
t
ext
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Pierre Habouzit
hoo
k
/
upd
a
te: e
x
a
m
ple of how to prevent branch crea
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Juni
o
C Hamano
Merge branch 'maint-1
.
6
.
1'
into
m
a
int
commit
|
commitdiff
|
tree
2009-04-18
Junio C H
a
m
a
no
M
e
rg
e
br
a
nch
'maint-1
.
6
.
0'
i
nto
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Th
o
mas Jaro
s
ch
Fix bu
f
fer ov
e
rflow in config pa
r
ser
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Michael J Gruber
r
e
mot
e
.
c: use
s
hor
t
en_u
n
am
b
ig
u
ous
_
ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Nguyễn Thái
N
gọc Duy
get_local_h
e
ads(): do n
o
t
retur
n
random
pointe
r
if
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-16
Ul
r
i
c
h
W
indl
git-apply
:
fix op
t
ion desc
r
iption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-16
Matthieu
Moy
Update
g
it
-
a
d
d
.
txt accordin
g
t
o
th
e
n
ew po
s
sibilitie
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-16
Je
f
f King
add-interactiv
e
: re
f
actor mo
d
e hunk handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-16
Matthieu Moy
git add -p: new "quit"
c
ommand at the prompt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-16
Mic
h
ał K
i
edrowi
c
z
builtin-apply: keep informa
t
ion about files t
o
be dele
t
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Mi
c
ha
ł
Kiedrowic
z
tests: test applying criss-cross ren
a
me patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
re
v
-pa
r
se
:
--
a
bbrev-ref opti
o
n to
s
h
ort
e
n ref
n
a
m
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert We
s
ar
g
f
o
r-each-ref:
u
t
i
l
ize core
.
warnAmbigu
o
usRefs for :short
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert
W
esarg
s
hort
e
n
_unambiguou
s
_
r
ef(): add stric
t
mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Je
f
f K
i
ng
docs/check
o
ut
:
c
l
arify
what "non-
b
ranch" mean
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
d
oc/checkout: split c
h
ecko
u
t and branch cr
e
ation in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc
/
checkou
t
:
refer
t
o g
i
t-branch
(
1) as appropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Jeff K
i
ng
doc:
r
e
fer to tracking configur
a
t
i
on as
"upstream"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc: clarify -
-
n
o
-track o
p
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Junio C
Hamano
git
i
gnore g
i
t-bis
e
ct--h
e
lper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Nanako Shiraishi
git
-
am:
tea
c
h git-am to appl
y
a patch
t
o
a
n unborn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Junio C Ham
a
no
Mark t13
0
1 permission test to depend on
POSIXPERM
commit
|
commitdiff
|
tree
2009-04-13
Junio
C
Hamano
GIT 1
.
6
.
3
-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Nanako Shir
a
i
shi
D
o
c
um
e
n
tation/git
.
txt: GIT 1
.
6
.
2
.
2
ha
s
bee
n
o
u
t for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
M
e
r
ge br
a
nch 'jk/no-perl'
commit
|
commitdiff
|
tree
2009-04-12
J
u
n
io C Ham
a
no
M
e
r
g
e
branch 'sb/doc-upstream-bra
n
ch'
commit
|
commitdiff
|
tree
2009-04-12
J
u
n
i
o C Hamano
Merge branch 'j
k
/show-upstre
a
m'
commit
|
commitdiff
|
tree
2009-04-12
Juni
o
C
Hama
n
o
Merg
e
b
ra
n
c
h
'
fg
/
remote-
p
r
u
ne
'
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
Merge branch 'cc/sha1-
b
search'
commit
|
commitdiff
|
tree
2009-04-12
J
u
nio C Hamano
Merge
b
r
an
c
h
'
cc/bisect-fil
t
e
r
'
commit
|
commitdiff
|
tree
2009-04-12
Junio
C Hama
n
o
Merge bra
n
ch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2009-04-12
J
u
nio
C H
a
mano
G
IT 1
.
6
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
Merg
e
branc
h
'maint-1
.
6
.
1' in
t
o
main
t
commit
|
commitdiff
|
tree
2009-04-12
Jun
i
o
C
Ha
m
ano
Merge branch 'maint-1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid
A
guilar
mergetool--lib: simpli
f
y API usag
e
by removing
more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
D
a
niel Cheng
(aka
.
.
.
State the effect of filter-branch on gra
f
t e
x
plicitly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Linus Torvalds
process_{
t
ree,b
l
ob}: Remove usele
s
s xs
t
rd
u
p
calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Johannes Sixt
t13
0
1-shared-repo: fix forced modes test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Ben Walton
documentation
:
Ma
k
e
f
ile ac
c
o
unts for SHELL
_
P
A
T
H
set
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Linu
s
Torvalds
A
llow users to
u
n
-
c
onfi
g
ure rename detect
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Mike Hommey
Repla
c
e
"
,<,>,& with their re
s
pect
i
v
e XM
L
e
n
tities
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Joh
a
nnes Schin
d
e
l
in
git-
s
vn:
a
l
w
ays
initiali
z
e wi
t
h
c
o
r
e
.
a
u
tocrlf=
f
al
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Dan McG
e
e
Update
d
e
lta co
m
pressio
n
message to be
l
ess mislead
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-11
Ferry H
u
berts
Fix mis
s
pelled
m
e
rgeto
o
l
.
k
e
e
p
Backup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-11
Erik
Broes
g
i
t
-
shel
l
: Add 'git-upload
-
a
rc
h
ive' t
o
allowed commands
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
add tests for remote
g
roups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Junio
C
Ham
a
no
Update draft release no
t
es to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Junio C Ha
m
ano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hama
n
o
Start
1
.
6
.
2
.
3 preparation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Junio C
H
a
mano
M
e
rge branch 'jc/shar
e
d-
l
i
te
r
all
y
'
into
m
aint
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge bra
n
c
h
'
jc/ma
i
n
t-1
.
6
.
0-d
i
ff-borrow-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C
H
amano
Merge
branch '
m
aint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-09
Ju
n
io C
H
amano
Merge b
r
a
n
ch
'maint-1
.
6
.
0
' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Junio C Ham
a
no
Merge bra
n
ch 'jc/m
a
int-1
.
6
.
0-keep-pac
k
'
into main
t
commit
|
commitdiff
|
tree
2009-04-09
Junio
C
Hamano
Merge branch 'jc/main
t
-1
.
6
.
0
-bla
m
e-
s
' in
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge br
a
nch 'bc
/
maint-1
.
6
.
1-branch-deleted-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
J
unio C Hamano
Merge
bran
c
h
'js/maint-1
.
6
.
0-exec-p
a
t
h-env
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C Ham
a
no
Merge branch 'tr/mai
n
t-1
.
6
.
1-doc-form
a
t-patch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Bj
ö
rn Stein
b
rink
process_{
t
ree,
b
lob}: R
e
mo
v
e
u
s
eless xst
r
du
p
c
alls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
tes
t
s: sk
i
p
perl
t
ests if NO_P
E
RL is defined
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Je
f
f
King
Makefile: allow b
u
ilding without p
e
rl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Mo
y
git-
p
ull
.
sh: better warning m
e
ssage for "git p
u
ll"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergetool: re
f
a
c
tor commands to use
git-
m
ergetool
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
branch: show
upstream br
a
nch
when doub
l
e verbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
make get_s
h
o
r
t_r
e
f
a p
u
blic fun
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
for
-
each-ref:
add "ups
t
ream" fo
r
m
a
t field
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jeff Kin
g
fo
r
-each-ref: refactor
r
efna
m
e h
a
n
dling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jun
i
o C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-08
Junio
C
Ham
a
n
o
Merge b
r
anc
h
'maint-1
.
6
.
1' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-08
J
a
ri Aalto
Change double quot
e
s to
single quotes in message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hamano
Merge branch
'm
a
int-1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-08
Juni
o
C
H
ama
n
o
Merge branch '
l
t/reflog
-
expire'
commit
|
commitdiff
|
tree
2009-04-08
Jun
i
o C Hamano
Me
r
ge branch
'
b
s/maint-
1
.
6
.
0-tree-walk-pre
f
i
x
'
commit
|
commitdiff
|
tree
2009-04-08
J
unio C Hamano
Merge bra
n
ch 'ms/http-auth'
commit
|
commitdiff
|
tree
2009-04-08
Junio
C
Hama
n
o
Me
r
ge branch 'js/maint-su
b
mo
d
ule
-
checkout'
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hamano
M
erge b
r
a
n
ch
'
cb
/
maint-merge-recur
s
ive-submodule-fi
x
'
commit
|
commitdiff
|
tree
2009-04-08
J
unio C Ha
m
ano
Merge branch
'm
h
/h
t
ml-path'
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool
:
use $
(
.
.
.
) i
n
stead of `back
t
icks`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
ba
s
h completion: add git-
d
if
f
tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: ad
d
s
u
p
p
ort f
o
r
a difft
o
ol
.
pro
m
p
t co
n
fig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
diff
t
ool: add
various g
i
t
-
d
ifftool
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: m
o
ve 'git-difftool' out of contrib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Seb
a
s
tia
n
Pip
p
ing
difftool/merget
o
ol: add dif
f
u
s
e as mer
g
e and diff tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
diff
t
ool: a
d
d
a
-
y shortcut for --no-prompt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
guilar
difftool: use perl b
u
i
l
t-ins when
testing for
m
s
ys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool:
re
m
ove th
e
backup
file feature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftoo
l
: remove merg
e
op
t
ions
f
o
r
opendiff, t
k
diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelberg
g
i
t-mergetool:
a
dd new me
r
g
e
t
o
ol TortoiseMerge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
rkus Heidelberg
git-mergetool/di
f
ftool:
m
ake
(
g)vimdiff workable u
n
der
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next