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
Show error for 'git merge' with unset merge.defaultToUpstream
2011-10-03
Ju
n
io C Hamano
di
f
f: resurrect XDF_
N
EED_MINIMAL wit
h
--mini
m
al
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-30
J
u
nio C Hamano
Git
1
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-30
Junio C Hamano
c
h
e
c
k
o
ut $tree $path: do
n
o
t
clobber local changes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-27
Gerrit
Pape
templa
t
es/h
o
ok
s
--*
:
remov
e
sample hooks wit
h
out any
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-27
M
i
chael Hag
g
erty
n
o
tes_merge
_
c
o
m
mit(): do no
t
pass temp
o
rary buffer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-27
Pet
e
r Stuge
git
w
eb: Fix links to li
n
e
s
in blobs
when javascript
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-26
G
e
r
r
i
t
P
ape
contri
b
/h
o
o
k
s: ad
a
pt co
m
men
t
about De
b
ian inst
a
l
l
location
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-26
Junio
C Hamano
apply --wh
i
tesp
a
ce=error
:
c
orrectly
r
ep
o
rt new
b
la
n
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-26
Re
n
é Scharfe
Revert
re
m
oval of mu
l
t
i-match discard heuristic in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-26
Junio C Haman
o
Me
r
ge branch 'jc/
n
ame
s
pac
e
-doc-w
i
t
h-ol
d
-
a
sci
i
doc'
commit
|
commitdiff
|
tree
2011-09-26
Nguyễn
T
h
á
i Ngọc D
u
y
g
it-read-tree
.
txt: update sparse checkout examples
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-26
Ju
n
io C Hamano
merge
t
ool: no longer n
e
ed t
o
s
a
ve
s
tandard i
n
put
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-26
Jonat
h
o
n
Mah
mer
g
e
tool: Use args as pa
t
hspec to unme
r
g
e
d files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-23
J
u
nio C Hamano
G
i
t 1
.
7
.
7-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-23
Junio C Hamano
M
erge 1
.
7
.
6
.
4 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-23
Juni
o
C Hamano
merge-
r
e
c
ursive: D
o
not
l
ook at work
i
n
g
t
ree d
u
rin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-23
Ju
n
io C
Hama
n
o
Git 1
.
7
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-23
J
u
nio C Ha
m
an
o
Merge bran
c
h 'cb/maint-ls-file
s
-error-r
e
por
t
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-09-23
Al
l
an
C
affee
des
c
ribe: Refresh
the
i
ndex w
h
e
n run with --dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-23
Junio C
H
amano
Merge branch 'jc/maint-clo
n
e-a
l
ternates' int
o
maint
commit
|
commitdiff
|
tree
2011-09-23
Junio C Hamano
Me
r
ge branch '
n
d/maint-clone-
g
itdir' into maint
commit
|
commitdiff
|
tree
2011-09-23
J
u
n
io
C
Hamano
Merge bra
n
ch '
m
h/check-ref-fo
r
mat
-
p
r
i
nt-normalize'
.
.
.
commit
|
commitdiff
|
tree
2011-09-23
Junio
C
Haman
o
Merge branch 'm
g
/branch-
s
et-u
p
str
e
am-prev
i
ous' into
.
.
.
commit
|
commitdiff
|
tree
2011-09-23
Junio C
H
am
a
no
Merge branch 'gb/maint-
a
m-patc
h
-f
o
rmat-error
-
messa
g
e
.
.
.
commit
|
commitdiff
|
tree
2011-09-22
Ju
n
io C Hamano
diff: teach -
-
stat/--n
u
mstat
t
o ho
n
o
r -U$
n
um
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-22
Mich
a
el S
c
hubert
patch
-
id
.
c:
u
se strbu
f
i
nstead of a f
i
xed buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-21
Michael J Gruber
git-read-tree
.
txt: corre
c
t spars
e
-chec
k
out and skip
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-21
Mi
c
hael
J
Grub
e
r
git-read
-
t
r
ee
.
txt: language and typography
f
i
x
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-21
Michael J
G
r
uber
u
npack-trees: pr
i
nt "
A
b
o
rting" to stde
r
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-21
C
a
rlo
s
Martín Nieto
Remo
v
e 'working
c
opy' from
the documentation
and C
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-21
Ramsa
y
Jones
t915
9
-*
.
sh:
skip for mergein
f
o
te
s
t
for svn <=
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-21
Stefan Nae
w
e
Documentati
o
n
/
git-update-index: refer to
'
ls-files'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-21
C
h
r
istian
C
o
u
der
b
isect:
fix ex
i
ting w
h
e
n
checkout
f
ail
e
d in
bisec
t
_start(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-20
Junio C Ha
m
ano
Mer
g
e
b
r
anch
'
m
a
int'
commit
|
commitdiff
|
tree
2011-09-20
J
a
y Soffian
git-
m
er
g
etool:
c
heck retur
n
value from read
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-19
Junio
C Hamano
M
e
r
g
e branch
'ph/for
m
at-patch
-
no-color'
commit
|
commitdiff
|
tree
2011-09-19
Jeff
K
ing
t4
0
14: clean u
p
fo
r
mat
.
th
r
e
ad
c
o
n
fig after each
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-19
Ju
n
io C
H
amano
T
e
ach progress eye-candy to fetch_refs_fr
o
m_bundle()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-18
J
u
nio C Hamano
Git 1
.
7
.
7
-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-18
Nguyễn Thái Ngọc Duy
Ac
c
ept tags
in HEAD
or MERGE_HEAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-18
Nguyễn Thái N
g
ọc D
u
y
merge: r
e
move global variab
l
e
h
e
a
d[]
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-18
Nguyễ
n
T
h
ái N
g
ọc Duy
merge: use retu
r
n v
a
l
ue
o
f resolv
e
_ref()
t
o determine
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-17
Jun
i
o C Hamano
Merge br
a
nch 'ci
/
forbid-unwant
e
d-cu
r
rent-br
a
nch-update'
commit
|
commitdiff
|
tree
2011-09-17
J
u
nio
C
Hamano
b
ranch --set-upstream: regressio
n
fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-16
Frédéric He
i
t
zm
a
nn
Disa
m
biguate duplicate
t
9160* te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-16
Jakub
Nareb
s
ki
gitweb:
S
trip
n
on-
p
rintable characters from
s
yntax
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-16
Junio C Hamano
Docu
m
entation/gitnamespaces
.
txt: cater to older asci
i
doc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-15
Jeff
K
i
ng
filter
-
bra
n
c
h
: us
e
require_cle
a
n_work
_
t
ree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-15
Thomas Rast
t6019:
a
vo
i
d
refn
a
me
c
olli
s
io
n
on c
a
se-ins
e
nsitive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-15
Ju
n
io C Hama
n
o
M
erge branc
h
'ph/fo
r
mat-patch-no-co
l
or
'
commit
|
commitdiff
|
tree
2011-09-14
Jeff King
run_ho
o
k: use argv
_
arr
a
y API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-14
Je
f
f King
c
h
eckout:
u
se arg
v
_arra
y
A
PI
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-14
Jeff Kin
g
bisect: use argv_array API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-14
Jeff King
quote:
prov
i
de
s
q
_dequote
_
t
o
_argv_
a
r
ray
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-14
Jef
f
King
r
efactor ar
g
v_
a
rray into generic code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-14
J
e
ff
K
i
ng
quote
.
h: fix bogu
s
comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-14
Jeff King
add sha
1
_array API docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-13
Thomas Rast
Documentation:
b
asic
c
o
nfiguration
of not
e
s
.
rewriteRef
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
H
a
i
t
ao Li
date
.
c: S
u
p
p
ort iso8601 timezone formats
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
Junio C Hamano
refa
c
tor run_receive_hook(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
Jeff K
i
ng
fe
t
ch: avoid qu
a
dratic
loop checking for updated
s
ubmodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
Pan
g
Yan Han
f
or
m
at-patch: ignore ui
.
color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
Junio C Hamano
Git 1
.
7
.
7-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
Jun
i
o C Ham
a
no
Sync with 1
.
7
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
Junio C Hamano
Merge
branch '
j
n/re
m
ote-helpers
-
doc'
commit
|
commitdiff
|
tree
2011-09-12
Junio C Hamano
Git 1
.
7
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
J
u
nio C Haman
o
Merge branch 'jl/
m
aint-fetc
h
-
submodule-
c
heck-fix'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-09-12
Junio C Ham
a
n
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-09-12
Ju
n
i
o
C Haman
o
P
r
epare for 1
.
7
.
6
.
3 mainten
a
nce r
e
lease
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
Jun
i
o C Hamano
Mer
g
e branch 'ms/reflog-show-is
-
default
'
into maint
commit
|
commitdiff
|
tree
2011-09-12
Juni
o
C
H
amano
Merg
e
b
r
anch 'jk/reset
-
r
e
flog-message-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-09-12
J
unio
C
Ha
m
ano
Merge branch '
v
i/make-test-vecto
r
-less-spec
i
fic' into
.
.
.
commit
|
commitdiff
|
tree
2011-09-12
Ju
n
io C
Hamano
Merge branc
h
'jk
/
ta
g
-c
o
n
tains-ab' (early part
)
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-09-12
Ju
n
io C H
a
man
o
Merge b
r
an
c
h 'dz/conne
c
t-e
r
ror-
r
e
p
o
rt' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-09-12
Junio C Hama
n
o
Merge branch 'jc/main
t
-mergeto
o
l-
r
e
ad-fix' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-09-12
J
unio C Hamano
Merge branch 'j
k
/maint-co
n
fig-param
'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-09-12
Junio C Hamano
M
e
rge b
r
anch 'jn/do
c
-
dashd
a
sh'
into maint
commit
|
commitdiff
|
tree
2011-09-12
J
u
n
i
o C Hamano
Me
r
ge branch 'jk/maint-1
.
7
.
2
-
status-ignored' into maint
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweig
b
ergk
remote: o
n
ly
u
pdate rem
o
te
-
tracking branc
h
if up
d
at
i
n
g
.
.
.
Suggested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
rem
o
te ren
a
me: warn when
refsp
e
c
w
a
s not updated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zw
e
i
gbergk
remote:
"
rename
o foo"
should not rename
ref "origi
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
w
eigber
g
k
remote: write correct
f
e
t
ch
s
p
ec when r
e
naming remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
Sv
e
rre
R
abbeli
e
r
SubmittingPath
c
es: remove Cogito reference
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-12
Jun
i
o C Ham
a
no
fsc
k
:
d
o
not abort upon find
i
ng an
empty
b
lob
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-09
Jens L
e
hmann
fetch: skip on-demand ch
e
cki
n
g when no submodules are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-07
Michae
l
J
G
r
u
b
e
r
RelNotes/
1
.
7
.
7
:
minor
fixe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-07
Junio C Ham
a
no
Minor update to
h
ow-
t
o maintain git
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-06
Jonathan Niede
r
http: avoid
empty error messages for some curl errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-06
J
onath
a
n Nieder
http: remove ext
r
a newli
n
e
in
e
r
r
or message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-06
Junio C Hamano
U
pdate draft release note
s
to
1
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-06
Junio C Hamano
Merge
branch 'rc/histo
g
ram-diff'
commit
|
commitdiff
|
tree
2011-09-06
J
unio C Hamano
Merg
e
branch 'cb/maint-ls-files
-
error-report'
commit
|
commitdiff
|
tree
2011-09-06
Junio
C
Hamano
Merge
branch 'mh/che
c
k-ref-format
-
p
r
int-normalize'
commit
|
commitdiff
|
tree
2011-09-06
Junio C Ham
a
no
Sy
n
c with 1
.
7
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-06
Junio
C
Hama
n
o
Git 1
.
7
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-06
J
un
i
o
C
Hamano
Revert
"
M
e
rge branch 'cb/ma
i
n
t
-quiet-push' i
n
to maint
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-02
Ju
n
i
o C Hamano
U
p
date dr
a
f
t release note
s
t
o 1
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-09-02
J
unio C Hama
n
o
Merge branch 'js/i18n-scripts-
2
'
commit
|
commitdiff
|
tree
2011-09-02
Juni
o
C
Hamano
M
e
rge branch 'tr/maint-t3903-misquoted-command'
commit
|
commitdiff
|
tree
2011-09-02
Junio
C
H
amano
Merge branch 'bc/bisect-test-use-she
l
l-path'
commit
|
commitdiff
|
tree
next