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
Be more user-friendly when refusing to do something because of conflict.
2010-01-12
Matth
i
eu M
o
y
B
e
more user-friendly when refusing t
o
do som
e
thing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Juni
o
C Hamano
G
i
t
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
J
unio C Hama
n
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-22
D
avid
Reiss
P
rev
e
nt
git
bla
m
e
f
rom seg
f
aulting on a missing author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
J
unio C Hamano
Git
1
.
6
.
6-
r
c4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Jun
i
o C Hamano
Merge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2009-12-20
Björn Gustavsson
rebase -i: abort cleanly
i
f
t
h
e
e
ditor
f
ails
t
o
laun
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
S
t
ephen
Boyd
tech
n
ical-docs: d
o
cument hash API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen
Boy
d
api
-
strbuf
.
txt: fix t
y
pos and document la
u
nch_edi
t
or()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
unio C Hama
n
o
Git 1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
unio C Ham
a
no
M
e
rge bra
n
ch 'maint' to sync w
i
th 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io C
Hamano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Ha
m
ano
worktr
e
e
:
don't s
e
gfault with
a
n ab
s
o
lut
e
pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jef
f
Kin
g
ignore unkn
o
wn col
o
r configuratio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Johan
n
es Sixt
help
.
a
u
tocorrect: do n
o
t run a
command i
f
the
c
omm
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
N
a
na
k
o Shirais
h
i
Illust
r
at
e
"
f
ilte
r
"
attribute wi
t
h
an examp
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björ
n
G
ustavss
o
n
b
a
s
h: Support ne
w
'git
f
etch' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Release No
t
e
s
for
1
.
6
.
6 to
r
emove old bugfixe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C
Hamano
S
ync with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C H
a
mano
G
i
t 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Haman
o
Fix arc
h
ive fo
r
m
a
t with -
-
on
the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
ni
o
C Hamano
Remove
post-uplo
a
d-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C
Ham
a
no
Gi
t
1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
unio C
H
amano
M
erge git://
r
epo
.
or
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
Merge git://g
i
t
.
kernel
.
org/pub/scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
J
uni
o
C Hamano
U
p
date draft re
l
e
a
se notes to
1
.
6
.
6 before -r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Ha
m
ano
M
erge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Ha
m
ano
Merge
b
ranch 'mm/mai
n
t
-
mer
g
e
-
ff-e
r
r
o
r-messag
e
-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
amano
Merg
e
br
a
nch 'jn/m
a
int-pull-rebase-error-message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
rge br
a
nch
'
j
k/maint-add-p-de
l
ete-fix'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Merge git
:
//g
i
t
.
bogomi
p
s
.
o
r
g
/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Ju
n
io C Hamano
Re
v
ert
recent "git merge <msg> HEAD
<
com
m
it>
.
.
.
" deprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-inte
r
active: f
i
x deletion of non-e
m
pty 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'
c
omplet
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
Hamano
Sync w
i
th 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
Hamano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus Tor
v
alds
Fix
diff -
B
/--dirstat miscounting of new
l
y
a
dde
d
c
o
ntents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
eff King
rese
t
: improve worktree safe
t
y valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zulling
e
r
Documentation: A
v
oi
d
use
of xm
l
to --st
r
ingparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René S
c
ha
r
fe
archive:
cla
r
ify descriptio
n
of p
a
th parame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere:
don'
t
segfault on failure to open rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hama
n
o
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ham
a
no
Prepare for
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branch
'
uk/maint-shortlog-encodi
n
g' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge
b
ran
c
h
'f
c
/maint
-
f
o
r
mat-
p
atch-pa
t
h
s
pec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge
branch
'
ap
/
maint-merge
-
strategy-list-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'jc/maint-a
m
-keep' into main
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Ham
a
no
Merg
e
b
r
anch 'rs
/
work-
a
roun
d
-grep-opt-i
n
sa
n
ity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
r
ge branch 'rj/m
a
i
n
t-
c
y
gwin-coun
t
-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
n
o
Merg
e
br
a
n
ch '
m
m/maint
-
hint-failed-merge'
into
main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Merge bran
c
h 'th/maint-
r
emote
-
updat
e
-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branch
'
rj
/
maint-t9700' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Merge bra
n
ch '
l
s/maint
-
mailinfo-no-inbody' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch 'm
o
/maint-
c
rlf-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ha
m
ano
Merge branch 'th
/
remote-us
a
ge
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C Haman
o
Merge branch 'pb/maint-use-cu
s
tom-
p
erl' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch
'
m
m
/co
n
fig-pathname-ti
l
de-ex
p
an
d
' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'bc/grep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch
'
jk/maint-break-r
e
name-reduce-me
m
or
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ha
m
an
o
Merge branch 'rj/ma
i
nt-si
m
plif
y
-cygwin-makefile' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch 'rg/do
c
-work
f
l
ow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Me
r
ge
b
r
anc
h
'np/maint-s
i
deband-favor
-
s
tatus' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Na
r
ebski
gitweb: Describe (possible
)
gitweb
.
js
minification
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Documentat
i
o
n: xmlto
0
.
0
.
18 d
o
es
n
o
t know --stringpar
a
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Joha
n
Herland
Fix crasher on en
c
ounteri
n
g SHA1-like non
-
note
in notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t
9001: us
e
older
G
etopt::L
o
ng boolean prefix '--no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Ca
s
ey
t
4201: use
I
SO8859
-
1 r
a
ther than ISO-8859-
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Kr
ü
ger
pull: clarify advice fo
r
the
unconf
i
g
u
r
e
d
e
rror case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Unc
o
n
d
itio
n
a
l
l
y set man
.
base
.
url
.
f
or
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
M
e
rge br
a
nch '
m
aint
'
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
Docume
n
ta
t
ion/Makefile:
a
llow man
.
base
.
url
.
for
.
re
l
ative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Git 1
.
6
.
6
-
rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Hor
s
t
H
.
von Brand
git-p
u
ll
.
sh: Fix call to
git-merge for new
c
o
mmand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
amano
Prepare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
merg
e
: d
o
not
add standard
mes
s
ag
e
when messag
e
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not misidentify "
g
it merge foo HEAD" as an
o
l
d-s
t
yl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
U
p
d
a
te draft releas
e
no
t
es
t
o 1
.
6
.
6 bef
o
re -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
r
ge br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
rge bran
c
h
'j
c
/deprecate-old-syn
t
ax-from-merge
'
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C
Hamano
git-merge: a dep
r
ecation
no
t
ice of
t
he an
c
ient co
m
mand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
Hamano
Merg
e
branch
'
bw/remote-get-
r
ef-
s
tates-fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert Wesarg
get_ref_states: strdup entr
i
e
s
an
d
free util in
s
tale
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
D
avid A
g
u
i
lar
he
l
p: Do not unnecessari
l
y
l
ook
for
a
r
eposito
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
Documenta
t
ion: Fix a
few i
.
e
.
/e
.
g
.
mix-u
p
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
r
g
e branc
h
'jn/gitweb-blame'
commit
|
commitdiff
|
tree
2009-12-01
Jakub Nar
e
b
ski
gitw
e
b: Add link to other blame
implementation i
n
bla
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jakub Nar
e
b
ski
gi
t
web: M
a
ke linking to actions
r
e
q
uiring Java
S
cr
i
p
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge br
a
n
c
h 'fc/maint-f
o
rmat-p
a
tch-pat
h
spec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Hamano
Mer
g
e branch 'mm/
m
aint-mer
g
e
-
ff-e
r
ror-m
e
ssage-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Merg
e
bra
n
c
h 'ap/m
a
i
n
t-mer
g
e-str
a
tegy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
a
no
Mer
g
e b
r
anch 'jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bran
c
h 'cc/b
i
s
e
ct-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bran
c
h 'em/comm
i
t-clai
m
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge br
a
nch '
j
c/m
a
ili
n
fo-remov
e
-
br
a
ckets
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Haman
o
Mer
g
e branch 'fc/send-ema
i
l-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Ha
m
an
o
Merge b
r
anc
h
'uk/maint-sho
r
tlog-encod
i
ng'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
Mer
g
e bran
c
h 'ns/send-email
-
no-chain-reply-
t
o'
commit
|
commitdiff
|
tree
next