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
Mat
t
h
i
e
u
Moy
Be more user-fri
e
n
d
l
y
w
h
en
refu
s
ing t
o
do s
o
mething
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
J
unio
C
Hamano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
Prevent gi
t
blame from segfaulting on a
missing au
t
hor
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Juni
o
C Hamano
Git
1
.
6
.
6
-
rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
J
u
nio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
B
jö
r
n Gustavsson
re
b
ase -i: abort clean
l
y
if the edit
o
r fails to l
a
unch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
S
tep
h
e
n Boy
d
tec
h
nical-doc
s
: docu
m
en
t
hash
A
PI
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
a
pi-s
t
r
buf
.
txt: fix
t
yp
o
s
a
nd document
lau
n
ch_ed
i
tor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C
Hamano
G
it 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C Hamano
Merge branch 'm
a
int' to sy
n
c
w
it
h
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio
C
Hamano
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
unio C Hamano
workt
r
ee: don't segfa
u
lt w
i
th an absol
u
te pat
h
spec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
igno
r
e unknow
n
color configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johannes Sixt
he
l
p
.
a
u
to
c
orrec
t
:
do not run
a
command if the c
o
mmand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
Nanak
o
S
hiraishi
Illus
t
rate
"
filter" at
t
ribut
e
wit
h
a
n
example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
B
jörn Gus
t
avsson
bash: Support new
'
g
i
t
fetch' options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Jun
i
o C Hama
n
o
U
p
date
R
e
l
ease Notes for 1
.
6
.
6 to rem
o
v
e old bugfi
x
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C H
a
mano
S
ync with 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io
C
Haman
o
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C Hamano
Fix archive
format wi
t
h -- on the com
m
an
d
line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
un
i
o C
H
amano
R
e
mov
e
pos
t
-
uplo
a
d-hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C Hamano
Gi
t
1
.
6
.
6-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C
Hamano
Merge git://re
p
o
.
or
.
c
z
/
git-gui
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hama
n
o
Merge git://git
.
kernel
.
o
rg/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Update d
r
aft rele
a
se notes to
1
.
6
.
6 bef
o
r
e -rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
M
erge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge br
a
n
c
h 'mm/maint-merge-ff-error-message-fi
x
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
i
o C Hamano
Merge
b
r
anch 'jn/maint-pull-rebase-error-message' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge
b
ranch 'jk
/
mai
n
t-a
d
d-p-delete-fix' i
n
to main
t
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
er
g
e
gi
t
://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C H
a
man
o
Revert recent "gi
t
merge <m
s
g> HEA
D
<commit>
.
.
.
"
de
p
recation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
J
eff King
add-interactive:
fix de
l
e
t
io
n
o
f
non
-
empty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER
Gábor
bash: upda
t
e 'g
i
t
commit'
c
omp
l
etion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Ha
m
ano
Sync
with 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
u
n
io C Ha
m
a
no
G
it 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Linus To
r
valds
Fix dif
f
-B/--dirstat misc
o
un
t
ing of n
e
w
ly
a
dded content
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Je
f
f King
r
e
set: impr
o
v
e worktree safety v
a
l
v
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullin
g
e
r
Do
c
umentation: Avoid use of
x
m
l
to --s
t
ringpa
r
am
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René Sch
a
rfe
archive:
clarify d
e
sc
r
iption
o
f
p
ath p
a
r
a
m
e
t
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jef
f
King
rerere
:
don't segfault on fa
i
lure to o
p
en rr-c
a
che
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
H
amano
Merge
b
r
a
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ham
a
no
P
r
ep
a
re f
o
r 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ham
a
no
M
erge
b
ranch 'uk/maint-shortlog-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branc
h
'
f
c/maint-format-patch-path
s
p
ec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Me
r
ge
b
r
a
nch 'ap/maint-mer
g
e-
s
tra
t
egy-l
i
st-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Haman
o
Merge branch
'
jc/main
t
-am-keep'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch
'
rs/work-
a
ro
u
n
d-grep-opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-cygw
i
n-c
o
unt-obje
c
ts' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge
b
r
anch 'mm/ma
i
n
t
-
hint-failed-merge'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
mano
Merge branch 'th/maint-r
e
m
o
te-update-help-
s
tring'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o
C
H
a
mano
Mer
g
e
branch 'rj/maint-t9700'
into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
M
e
rge
b
ranc
h
'ls/m
a
int-mailinfo-no-inb
o
d
y
' int
o
m
ain
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge bra
n
ch 'mo/maint-crlf-doc' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o
C
H
amano
Merge branch 't
h
/rem
o
te-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge
branch 'pb/maint-use-
c
ustom-
p
erl
'
into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Haman
o
M
e
r
g
e branch 'mm/c
o
nfig
-
pathname-tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
Haman
o
Merge branch
'
bc/grep
-
i-
F
' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
am
a
n
o
Merge branc
h
'
jk/maint
-
b
r
eak-
r
ename-reduce-me
m
o
r
y'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge
branch 'rj/m
a
int-simp
l
ify-cy
g
win-makefile'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C Ha
m
ano
Merge branch 'rg/
d
oc-workflow'
in
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
np/maint-
s
ideband-f
a
vor-status' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub N
a
rebski
gitweb: Des
c
ri
b
e (possible) gitw
e
b
.
js mi
n
ification
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
D
ocumentation: xmlt
o
0
.
0
.
18 does not
k
now --string
p
ar
a
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix crasher on enco
u
ntering SHA1-
l
i
ke non-note in notes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
B
r
andon Cas
e
y
t9001: use older
G
et
o
pt::Long b
o
olean
prefix
'-
-
no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brandon C
a
sey
t4201:
use IS
O
8859-1 ra
t
h
e
r than ISO-8859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Kr
ü
ger
p
ul
l
: clarify advice for th
e
unconfigured er
r
o
r
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io 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
H
amano
Unc
o
n
d
iti
o
nally
s
et man
.
base
.
u
rl
.
for
.
rela
t
ive
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C H
a
mano
Git 1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
von Brand
g
i
t-pull
.
sh:
F
i
x
c
all to git
-
merge f
o
r new
c
omma
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
ano
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prepar
e
for 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
:
d
o
not
a
dd standard mes
s
age when message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not miside
n
tify "git merge foo HEAD"
a
s an
o
ld-styl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C H
a
mano
Update d
r
aft release n
o
tes
to
1
.
6
.
6 before
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Me
r
ge br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Hama
n
o
Merge
b
ranc
h
'jc/d
e
precate
-
o
ld-syntax-from-merg
e
'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Hamano
git-merge: a d
e
p
recation notice o
f
th
e
an
c
ient command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Ha
m
ano
Merge branch
'
bw/remot
e
-get-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert Wesarg
g
e
t
_
ref_state
s
: strdup ent
r
ies and fr
e
e util in stale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id Aguil
a
r
help: D
o
not u
n
neces
s
arily loo
k
for a re
p
ository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Mich
a
el J G
r
uber
Documentatio
n
: Fix a
f
ew i
.
e
.
/e
.
g
.
m
i
x-ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge b
r
anch 'jn/gi
t
w
e
b-blame'
commit
|
commitdiff
|
tree
2009-12-01
Jakub Narebs
k
i
gitweb: Add
lin
k
to other blame
i
mplem
e
ntation
in blame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jak
u
b Nare
b
ski
gitweb: Make linking t
o
actio
n
s re
q
uiri
n
g
J
av
a
Script
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Me
r
ge branch '
f
c
/
ma
i
n
t-format-patch-path
s
pe
c
-das
h
es'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hama
n
o
Merge branch
'mm/maint-
m
erg
e
-ff-error-m
e
ssage
-
f
ix'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C H
a
mano
Mer
g
e branch 'ap/maint-merge-strat
e
gy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C H
a
mano
Merge
branch
'jc/pretty-
l
f
'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hama
n
o
Merge branc
h
'cc/bis
e
ct-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merg
e
branc
h
'em/commit-
c
l
a
im'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Merge b
r
anch 'jc/mailinfo-r
e
mov
e
-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bran
c
h 'fc/send-email-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C
Ha
m
ano
Mer
g
e branch 'uk/maint
-
shortlog
-
e
n
codi
n
g'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Ha
m
ano
Mer
g
e branch 'ns
/
send-email
-
no-chain-re
p
ly-
t
o'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Ha
m
ano
Merge branc
h
'jc/
m
aint-am-keep
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
M
erge b
r
anch
'bw/diff-color
-
h
unk-head
e
r'
commit
|
commitdiff
|
tree
next