repo.or.cz
/
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
Ma
t
thieu Moy
Be more user-friendly when ref
u
si
n
g to do something
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C
H
am
a
no
Git
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C H
a
ma
n
o
Merge
bra
n
ch
'
m
a
int'
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
Preve
n
t
git
b
l
a
me from segfaulting on a m
i
ssing author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
io C Hamano
Git 1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Merge b
r
an
c
h 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2009-12-20
Björn Gustavsson
rebase -i: abort cleanly if the editor fails
to launch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
t
e
chnica
l
-docs
:
d
o
c
u
ment h
a
s
h
API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Step
h
en Boyd
api-str
b
uf
.
txt: fix
t
y
p
o
s and d
o
cument
l
aunch_editor(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
Git 1
.
6
.
6-rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Merge branch
'
m
a
i
nt' t
o
syn
c
with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio
C
Ham
a
no
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
worktr
e
e: d
o
n't seg
f
ault with an absolute pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
ignore unkn
o
w
n
color configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Johannes Sixt
help
.
a
u
tocorrect: do not run
a
command if th
e
comma
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shi
r
aishi
I
l
lustra
t
e "filter" attribute with
a
n example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björn Gustavsson
bash: Support n
e
w '
g
it
fetch' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hama
n
o
Update Re
l
e
ase Notes fo
r
1
.
6
.
6
to remove old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio C
Hamano
Sync with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Gi
t
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Hamano
Fix
arc
h
ive forma
t
w
i
th
-
-
on the comman
d
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io
C Hamano
Remove post-upload-
h
ook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hama
n
o
Git
1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io
C
Hamano
Merge git:/
/
repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
J
unio C
H
ama
n
o
Merg
e
gi
t
:
//git
.
ke
r
nel
.
org/p
u
b/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Upd
a
te
d
ra
f
t rel
e
as
e
no
t
e
s
to 1
.
6
.
6
b
e
fore -r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
M
er
g
e branch 'mm/maint-mer
g
e-ff-error-mes
s
age-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
amano
Merge
branch 'jn/main
t
-p
u
ll-
r
ebas
e
-error-messa
g
e' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
M
erge branch 'jk
/
maint-add-p
-
delete-fix' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Me
r
ge git:
/
/git
.
bog
o
mips
.
org/g
i
t-
s
vn
commit
|
commitdiff
|
tree
2009-12-08
J
u
ni
o
C Hamano
Re
v
ert recent "gi
t
merge <msg> H
E
AD <commit>
.
.
.
" deprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Jeff
King
a
d
d
-int
e
ractive: fix del
e
tion of non-em
p
ty f
i
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
SZEDE
R
Gábor
bash: u
p
dat
e
'git com
m
it' c
o
mpl
e
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
Ha
m
ano
Sy
n
c with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
un
i
o C Ha
m
ano
Git
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Li
n
us
T
orva
l
ds
Fix diff
-
B
/--dirsta
t
mis
c
ounting of newly added contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
res
e
t: improve wo
r
ktree safety valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Z
u
llin
g
e
r
Documentatio
n
: Avoid
u
se of xmlto --st
r
i
n
gparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Re
n
é Scharfe
archive: clarify descripti
o
n of
p
a
t
h paramet
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Je
f
f King
r
erere: do
n
't segfau
l
t on fa
i
l
ure to open
rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C H
a
m
a
no
Prepare
fo
r
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Haman
o
M
e
rge
b
ranch 'uk/mai
n
t-shortlog-e
n
c
o
din
g
'
into main
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branc
h
'fc/maint-format-patc
h
-pathspec-dash
e
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
ap/maint
-
merge-stra
t
e
gy-list-f
i
x' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
j
c/mai
n
t
-
am-keep' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C H
a
mano
Merge branch 'rs/work-around-grep-opt-insanity'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
rj/maint
-
cygwin
-
count-
o
b
j
ects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
M
erge
branch 'mm/
m
aint-
h
int-
f
ailed-merge' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
an
o
Merge branch 'th
/
maint-remote
-
upd
a
te-help-stri
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merg
e
bra
n
c
h
'rj/main
t
-
t
9
7
0
0' into
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge
branch 'ls
/
maint-maili
n
fo-no-inbody' i
n
to
maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch
'
mo/maint
-
crlf-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ham
a
n
o
Merge branch 'th/remote-usage' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
H
a
m
a
no
Merge branch 'pb/m
a
int
-
use-custom-perl' into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge branch 'mm/
c
onfig-p
a
thna
m
e-
t
ilde-ex
p
and'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge branch 'bc/grep-i
-
F' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge br
a
nch 'j
k
/maint-break-rename-redu
c
e-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge bra
n
c
h
'r
j
/
maint-simpl
i
fy-cygw
i
n
-
m
akefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Mer
g
e b
r
anch 'rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'np
/
maint-si
d
eba
n
d
-
favor-s
t
atus
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Narebski
gitwe
b
: Descr
i
be (
p
oss
i
ble) g
i
t
w
eb
.
js mini
f
icat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hama
n
o
Do
c
umentation: xmlto 0
.
0
.
1
8 does not kn
o
w --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herlan
d
F
i
x crasher
o
n encountering SHA1-like non-note in notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
B
randon Casey
t9001: use older G
e
topt::L
o
ng bool
e
a
n
prefix
'
-
-
no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t4201:
use ISO8859
-
1 rath
e
r than
I
SO-8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Kr
ü
ger
p
ull:
clarify advice for the unconfigured error
c
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o C Hamano
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C
Ham
a
n
o
Git
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Unconditionally
s
et m
a
n
.
b
a
se
.
url
.
for
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Me
r
ge bran
c
h 'mai
n
t
'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
amano
D
o
c
umentation/
M
akefile
:
allow man
.
base
.
u
rl
.
for
.
r
elativ
e
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
G
i
t 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
von Brand
git-pull
.
sh:
Fix call to git-merge for
new command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C H
a
mano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hamano
Prep
a
re
f
or 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C Hamano
merge: do n
o
t
add standard m
e
ssage when m
e
ssage is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
a
n
o
Do not misidentify "gi
t
merge foo HEA
D
"
a
s an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Haman
o
Updat
e
draft r
e
l
eas
e
n
o
tes
t
o
1
.
6
.
6 be
f
ore -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
man
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
Merge branch
'jc/deprecate
-
old-synta
x
-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git-merge: a deprecation notice of th
e
an
c
i
ent
c
ommand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Ham
a
no
Merge branch 'bw/rem
o
te
-
get
-
r
ef-sta
t
e
s
-fi
x
'
commit
|
commitdiff
|
tree
2009-12-01
B
ert Wesarg
get_
r
ef_states: strd
u
p ent
r
ies and fr
e
e util i
n
s
t
ale
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not unnecessarily look
f
or a repos
i
tory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michae
l
J Gruber
Do
c
umentatio
n
: Fix a few i
.
e
.
/e
.
g
.
mix
-
ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio
C Haman
o
Merge branch '
j
n
/gi
t
web-blame'
commit
|
commitdiff
|
tree
2009-12-01
Jaku
b
Narebs
k
i
gitweb: Add link
to other blame implementa
t
ion
i
n blame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jak
u
b
Narebs
k
i
git
w
e
b
: Make linking to actions re
q
uiring JavaScript
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
M
e
rge bra
n
ch 'fc/
m
aint-
f
o
r
mat-
p
atch-pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C
H
am
a
no
Merge
b
ranch 'mm/maint-mer
g
e-ff-erro
r
-message-
f
ix'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o
C Ha
m
ano
Merge bran
c
h 'ap/main
t
-
m
erge-st
r
ate
g
y-list-f
i
x'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Me
r
ge branch 'jc/
p
re
t
t
y
-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
ma
n
o
Merge branch
'c
c
/b
i
sect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Merge branch
'
em/commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
io
C Hamano
Me
r
g
e
branch 'jc/mailin
f
o-remove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
a
mano
Merge bran
c
h '
f
c/
s
end-email-en
v
elope'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
M
erge bra
n
ch '
u
k/maint-
s
hort
l
o
g
-encoding'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
io
C
Hamano
M
e
rge bran
c
h
'
ns/send-
e
ma
i
l-
n
o-chain
-
repl
y
-to'
commit
|
commitdiff
|
tree
next