repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: reset: add some missing tables
2010-01-05
C
hristian Cou
d
er
Do
c
umentation: reset: add some missing table
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Jun
i
o
C
Hamano
Fix bi
t
ass
i
gn
m
ent for
CE_CONF
L
ICTED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
J
u
nio C
H
a
mano
"r
e
set
-
-merge": fi
x
unmerged case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-03
St
e
phan Beyer
reset: use
"unpa
c
k_t
r
ees
(
)" di
r
ectl
y
in
s
tead of "git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Christian Couder
r
e
set:
add a few tests for "git reset --
m
erge"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Chris
t
ian Couder
Documentat
i
on: reset
:
a
d
d some t
a
bles to describe the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Christian Coud
e
r
r
e
s
e
t: improve mixed r
e
set error me
s
sage
when in
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Juni
o
C Ha
m
ano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
Merge b
r
anch 'm
a
int
'
commit
|
commitdiff
|
tree
2009-12-22
D
avid Reiss
Prevent git bla
m
e
from segfault
i
n
g on
a mis
s
ing author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
Hamano
Git 1
.
6
.
6
-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
H
amano
Merge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2009-12-20
Björn Gu
s
tavsso
n
reb
a
se -
i
: abort cleanly if
t
he editor fail
s
to lau
n
ch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Bo
y
d
technical
-
docs
:
document hash AP
I
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephe
n
Boyd
api-st
r
b
u
f
.
txt:
fix typos and
documen
t
lau
n
ch_edit
o
r(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io C Ham
a
no
G
i
t 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Haman
o
Me
r
ge bran
c
h 'maint' to
sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C
Hama
n
o
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: don't s
e
gfault wit
h
an absolute pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Jeff Ki
n
g
ignore unk
n
own color conf
i
guration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Joh
a
nnes Sixt
help
.
autocorrect: do not
r
un
a
command if the comm
a
nd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shirai
s
hi
Illu
s
t
rate "filter"
attribute
w
ith
an ex
a
mple
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Bjö
r
n Gust
a
vsson
bash: Support new 'git fetch
'
options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio
C
Ha
m
ano
Update Release Notes
f
o
r 1
.
6
.
6 to remove old bug
f
ixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C
Hamano
Sync with 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Hamano
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Fix a
r
chive
f
ormat wit
h
--
o
n
the comman
d
line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio
C Hama
n
o
Rem
o
ve
po
s
t-upload-ho
o
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git
1
.
6
.
6
-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Ham
a
n
o
M
erge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
M
e
r
ge git://git
.
kern
e
l
.
org/
p
ub/scm/gi
t
k
/
gitk
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Upd
a
te draft
release
n
otes
to 1
.
6
.
6 before -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Merge
b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
Merge branc
h
'
mm/maint-merge-ff
-
error-message
-
f
i
x'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C
H
amano
Merge branch
'
jn/maint-pull
-
r
e
b
a
se-
e
rror-message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Me
r
ge branch
'
jk/maint
-
add
-
p-delete-
f
ix' into main
t
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Me
r
ge git:/
/
git
.
bogomips
.
o
r
g/git-sv
n
commit
|
commitdiff
|
tree
2009-12-08
Junio
C
Ham
a
no
R
ever
t
recent "g
i
t mer
g
e <
m
s
g> HEAD <commit>
.
.
.
" dep
r
e
c
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
J
e
f
f
King
add-in
t
eracti
v
e: fix dele
t
ion o
f
non-e
m
p
ty file
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER Gábor
bash: update '
g
it commit' completion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C
Hamano
Sync wi
t
h 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 Torvalds
Fix di
f
f -B/--dirst
a
t misc
o
unting of newly added
c
onte
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Je
f
f
K
ing
rese
t
: improve work
t
r
ee sa
f
et
y
va
l
ves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
To
d
d Zullinger
Documenta
t
i
o
n:
A
void use of xmlto
--
s
tringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
R
e
n
é
Scharfe
archive: clari
f
y de
s
cription of path pa
r
a
m
e
t
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere
:
don't segfault on
fai
l
ure to open rr-c
a
c
he
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Ham
a
no
Pr
e
p
a
re fo
r
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
am
a
no
M
e
rge br
a
nch 'uk/maint-s
h
ort
l
og-enc
o
d
i
n
g
' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merg
e
b
ranch 'fc/
m
ain
t
-f
o
rmat-
p
at
c
h-pathspec
-
dash
e
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
am
a
n
o
Merg
e
branch 'ap/maint-mer
g
e
-
strateg
y
-
l
ist-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
man
o
M
erge bra
n
ch
'
jc/maint-am
-
keep
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge br
a
nch
'
rs/wor
k
-around-grep-o
p
t
-
insanity
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C H
a
m
a
n
o
M
e
rg
e
branch 'rj/mai
n
t
-
cygwin-count-objec
t
s' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hama
n
o
Merge
b
ra
n
ch 'mm/main
t
-hint-fa
i
led-me
r
ge' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Mer
g
e branc
h
'
th/maint-remote-
u
p
dat
e
-help-string
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch 'rj/main
t
-
t9
7
00' into
m
ai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'ls/maint-mailinfo-no-inbody'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge b
r
anc
h
'mo/ma
i
nt-c
r
lf
-
doc'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge bran
c
h 't
h
/
r
e
mote-usa
g
e' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'pb/maint-
u
se-custom-perl' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch 'mm/config-pathna
m
e-tilde-expan
d
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
no
Mer
g
e branch 'bc/
g
r
e
p-i
-
F'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e br
a
nch 'jk/maint-break-rename-red
u
c
e-me
m
ory
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
amano
Merge branch 'rj/maint-si
m
plif
y
-cygwin-make
f
ile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
a
mano
Merge bran
c
h 'rg/do
c
-workflow
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
Ham
a
no
M
erg
e
br
a
nch 'np/maint-sideband-
f
a
v
o
r-st
a
tus
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub
N
a
rebsk
i
gitweb:
D
escribe (possible) gitw
e
b
.
js minification
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Doc
u
men
t
ation: xmlto 0
.
0
.
1
8
d
oes not know --stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
o
han Herland
Fix crasher on encountering SHA1-like n
o
n
-
note in not
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t90
0
1:
u
s
e
o
lder Getop
t
::Lon
g
boolean prefix '-
-
no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
B
randon
C
asey
t4201
:
use ISO8859-1
r
ather than
ISO
-
885
9
-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krü
g
er
pull: clarify advice for the
u
n
c
o
nf
i
gured error ca
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
M
e
r
ge
in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
G
it 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
U
n
c
ondition
a
lly set m
a
n
.
base
.
url
.
for
.
r
e
l
a
t
ive
.
li
n
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C
Hamano
Git 1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Hors
t
H
.
von B
r
and
git-pull
.
sh: Fix
call
to
g
it-merge for new command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Hamano
M
erge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hamano
P
r
e
p
are for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
merge:
do n
o
t add stan
d
ard message when message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Hamano
Do not misidentify "git merg
e
f
oo HEA
D
" as an
ol
d
-sty
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io
C
H
aman
o
Upd
a
te dr
a
ft release notes to 1
.
6
.
6 before -
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o
C Ha
m
an
o
Mer
g
e branch 'j
c
/deprecate-old-syntax-from-
m
erge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
ma
n
o
git-mer
g
e
: a deprecation no
t
ice of the ancient co
m
mand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Hamano
Me
r
ge bran
c
h '
b
w/remote-get-r
e
f-st
a
tes-fix'
commit
|
commitdiff
|
tree
2009-12-01
B
e
rt
Wesarg
g
et_re
f
_st
a
t
e
s: strd
u
p entries
a
nd fr
e
e util in stale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
avid A
g
uila
r
help:
D
o not unnec
e
ssarily look for
a repository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
Docum
e
ntatio
n
:
F
ix a few i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
Merge branch
'
jn/gitweb-blame'
commit
|
commitdiff
|
tree
2009-12-01
Jak
u
b
Narebski
gitweb: Add link t
o
other b
l
ame i
m
plemen
t
ation in blame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jakub Nare
b
ski
g
i
tweb: Make linking
to act
i
o
n
s requiring JavaScript
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
M
e
r
ge bran
c
h 'fc/maint-format-patch-pat
h
spec
-
da
s
hes'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
io C Hamano
Merge branch 'mm/maint-
m
erge-ff-err
o
r
-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C
H
a
ma
n
o
Merge branch 'ap
/
maint-mer
g
e-strategy-list-fix
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
Merge branch '
j
c/pret
t
y-lf'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hama
n
o
Me
r
ge
branch 'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Merge branch 'em/commit-claim'
commit
|
commitdiff
|
tree
next