repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'nd/sparse-co-fix'
2011-05-09
J
uni
o
C H
a
man
o
convert:
m
ake it safer to add conv
e
rsion attrib
u
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C Hamano
c
o
nvert: give saner
names to crl
f
/eol variables, type
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
unio
C Ha
m
ano
convert: ren
a
me the
"eol" globa
l
vari
a
ble
t
o
"core_eo
l
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C H
a
mano
t1507
:
avoi
d
"${p
a
rameter<op>
'
word'}
"
inside do
u
ble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jonathan Nieder
compl
e
t
i
on: m
o
v
e
p
rivate shopt s
h
i
m
for zsh
t
o __git_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio
C Hamano
t3701: add-p-fix make
s
th
e
l
ast tes
t
to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C H
a
man
o
r
ere
r
e: libif
y
rerere_clear() a
n
d rerere_gc()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Co
n
r
ad Irwin
Use a tem
p
or
a
r
y
index for g
i
t com
m
it --i
n
tera
c
tive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Remov
e
gitweb/
g
itweb
.
c
gi and other legacy targets
f
rom
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
a
kub Nare
b
ski
g
i
t
-instaweb: Si
m
plify build dependency
o
n g
i
tweb
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan Nieder
tests:
check git d
o
es not ba
r
f on merge
.
ff
v
a
lues for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jo
n
a
than Ni
e
der
te
s
ts: teach verify_parents t
o
check for ex
t
ra p
a
r
e
nts
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
merge: introduce merge
.
ff conf
i
guration va
r
i
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch
'
jc/maint-branch-
m
ergeoptions' in
t
o
mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Haman
o
m
erge: make branch
.
<name>
.
mergeoptions cor
r
ectly overr
i
de
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan Nieder
tests: e
l
i
m
i
n
ate
unneces
s
ary setup test assertions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ham
a
no
Upda
t
e
d
raft r
e
lease not
e
s to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch
'jn/
r
un-comma
n
d-error-failure'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
M
er
g
e bran
c
h 'js/info-man-path
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Me
r
ge
b
ranch 'im/hashcmp-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
H
amano
M
e
rge b
r
anch 'jk/merge-on
e
-fi
l
e-working-tree'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
Merge branch 'jc/f
i
x
-
dif
f
-files-unmerge
d
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
e
rg
e
branch 'cj/
p
4merg
e
'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Me
r
ge
br
a
n
ch '
g
r/cvsi
m
p
ort-
a
lternative-c
v
spa
s
s-location'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
Merge branch 'sg/compl
e
tion-c
l
eanu
p
'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Ha
m
ano
Merge branch '
j
s/blame
-
parsename'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Me
r
ge branch 'jk/format-patch-quote-special-in-from'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merge br
a
n
c
h 'nd
/
struct-pathspec
'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hama
n
o
Mer
g
e branch 'aw/maint-reb
a
se-i-p-no-ff'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
M
e
rge br
a
nch 'mg/alias-exp
o
se-pr
e
f
i
x'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Merge branch 'mg/diff-uiconfig-do
c
'
commit
|
commitdiff
|
tree
2011-05-06
J
u
n
io C Hamano
M
erg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2011-05-06
João
B
ritto
Re
m
ove duplic
a
ted "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
S
verre R
a
bbeli
e
r
fa
s
t
-
import: fi
x
option parser for no-arg opt
i
on
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ham
a
n
o
Me
r
ge branch 'js/maint-1
.
6
.
6-se
n
d-p
a
ck
-
stat
e
less
-
rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Je
f
f King
send-pack: unbre
a
k push over stateless rpc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Va
l
entin Haen
e
l
git-reset
.
t
x
t
: better docs
f
o
r
'--pa
t
c
h
'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valenti
n
Haenel
git-checkout
.
txt: better docs for '--patch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Val
e
n
t
i
n
H
aenel
g
i
t
-
s
tash
.
t
xt: bette
r
do
c
s fo
r
'--patch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valent
i
n H
a
enel
git-
a
dd
.
txt: d
o
cumen
t
'intera
c
tive
.
singlekey'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
V
a
l
e
ntin Haenel
config
.
txt: 'interactive
.
s
inglekey; is used
b
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Haman
o
t3701: fix
here
d
ocum
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
M
i
chael J Gruber
git-fast-import
.
txt: --
r
e
l
ative-
m
arks
t
ak
e
s no paramet
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sha
r
o
v
shell: add m
i
ssing
initi
a
lization of
argv0
_
path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernh
a
r
d
t
t
/an
n
otate
-
tests
:
Use ec
h
o & cat instead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
man
o
Update draft release
n
o
t
es to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
C H
a
ma
n
o
Merg
e
b
r
a
nch '
m
l/test-rea
d
me'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
nc
h
'ft/git
w
eb-t
a
r-with-gz
i
p-n'
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge br
a
nch 'mg/rev-l
i
st-c
o
unt-
c
herry'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o C
Hamano
Merge
b
ranch
'ss
/
do
c
-svn'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merg
e
branch 'jn/format-patc
h
-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Haman
o
Merge branch 'vr/me
r
ge-base-doc'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hama
n
o
Merge br
a
nc
h
'ss/cherry-pi
c
k
-x-doc'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
H
aman
o
Merge b
r
anch 'jn/maint-format-patch-d
o
c'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
M
erge b
r
anch 'jk/format
-
patch-multilin
e
-heade
r
'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge
br
a
n
c
h 'j
m
/me
r
g
et
o
ol-submodules'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
S
ync with 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Git
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Haman
o
Merg
e
branch 'jh/dirstat
'
into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
branch 'sp/maint-cle
a
r-p
o
s
tfields' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
nch '
j
k/maint-s
t
ash-oo
b
' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o C
Hamano
M
erge branc
h
'jk/maint-upload-pack-shallow' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
r
a
n
c
h
'dm/stash-k-i-p' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge br
a
nch
'
jc/pack-ob
j
ects-bigfile' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Ham
a
no
Merge branch 'mg/reflo
g
-with
-
o
pt
i
ons' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'jk/stash-loosen
-
safety' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Haman
o
Me
r
ge branch 'ar/c
l
ean-r
m
dir
-
em
p
ty' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C H
a
m
ano
Merge branch 'mg/sha1-path-adv
i
se' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
V
a
lentin Hae
n
el
g
it-
a
d
d
.
txt: d
o
cumen
t
'
a
dd
.
ignoreErr
o
r
s
'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Tay Ra
y
Chuan
t55
4
1-http-
p
ush: a
d
d test fo
r
chun
k
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Dan
M
cGee
http-push
:
re
f
actor c
u
r
l
_easy_setup mad
n
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Dan McGee
http-push: use co
n
st for strings in signatures
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
D
an McGee
http: make cur
l
callbacks match co
n
tr
a
cts from curl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hama
n
o
Update d
r
a
ft r
e
lease
not
e
s
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
M
e
r
ge branc
h
'jk/notes-ui-updates'
commit
|
commitdiff
|
tree
2011-05-02
Ju
n
i
o
C Hama
n
o
Merge b
r
anch 'ab/
i
18n-fixup'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Merge bran
c
h
'nm/submodul
e
-update-
f
orce'
commit
|
commitdiff
|
tree
2011-05-02
Juni
o
C
Hamano
Merge br
a
nch
'
j
h
/
notes-add-ui'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Ha
m
ano
Merg
e
br
a
nch
'n
d
/maint-setup'
commit
|
commitdiff
|
tree
2011-05-02
Jun
i
o C Hamano
Merge branch 'mz/
m
aint-ren
a
m
e
-unmer
g
ed'
commit
|
commitdiff
|
tree
2011-05-02
Jonathan Nieder
D
o
c
umentatio
n
: clarify meanin
g
of
--html-path, --
m
an
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Jon Se
y
m
o
ur
git: add
-
-info-pat
h
and --ma
n
-path opti
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
J
u
nio C Hamano
Up
d
at
e
draft
r
e
lease
n
otes
t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Junio
C
Hama
n
o
Merge branch 'rs/strb
u
f-setlen-assert'
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
Merge
branch 'vh/git-
s
vn-doc'
commit
|
commitdiff
|
tree
2011-05-01
Ciar
a
n J
e
ssup
Pass empty file to p4m
e
rge where no b
a
s
e is sui
t
able
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
G
u
y Rouilli
e
r
Look for
passwor
d
in
b
oth CVS and CVSNT password files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
King
merge-one-file: fix
b
roken merges w
i
th alternate w
o
rk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests for merge-in
d
ex /
m
erge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"
add -p": wo
r
k-aroun
d
an o
l
d laziness that
does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add--interact
i
ve
.
p
erl: factor out repeat
e
d --
r
ecount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3701: Editing a
s
plit hu
n
k in an "ad
d
-
p
"
s
ession
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
H
a
mano
add -
p
: 'q
'
sho
u
l
d reall
y
quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
a
k
u
b Nar
e
bski
gitw
e
b: Mark matched 'ctag' / co
n
t
ents
t
ag (?by_tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
a
kub Nar
e
bs
k
i
git
w
eb:
C
hange the
w
a
y
"content tags"
('ctags') are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
a
kub Nareb
s
k
i
g
i
twe
b
: Restru
c
ture projects list
g
en
e
ratio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hama
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
amano
S
t
a
rt 1
.
7
.
5
.
1 mainte
n
an
c
e
t
r
a
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C
H
amano
Merge br
a
nch 'mg/x-years-12
-
months' into maint
commit
|
commitdiff
|
tree
next