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
t7111: check that reset options work as described in the tables
2010-01-10
Chr
i
stian Couder
t71
1
1: ch
e
ck that reset options work
a
s descr
i
bed in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-05
Ch
r
istian
C
ou
d
er
Documentation: reset: add
s
ome missing tables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio
C
Hamano
Fix bit assignment for CE_CONFLICTE
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
J
u
nio C Hamano
"reset --merge": fix u
n
merg
e
d
c
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-03
Stepha
n
Beyer
re
s
et:
use
"un
p
ack_trees
(
)" direc
t
ly inste
a
d of "g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
C
hristian C
o
uder
reset: a
d
d
a few tests
f
or "git reset --merge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Ch
r
i
s
t
ian Couder
Documentation: reset: add some tables t
o
de
s
c
ribe
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Christian Couder
rese
t
: improv
e
m
ixed re
s
et error message when in a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
J
unio C Ha
m
ano
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Ju
n
io
C
Hamano
Merge b
r
anch 'm
a
int
'
commit
|
commitdiff
|
tree
2009-12-22
D
avid Reiss
Pre
v
ent git blam
e
from
se
g
faulti
n
g on a missing author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
Hamano
G
it 1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Bjö
r
n Gustavsson
rebase -i: abor
t
clea
n
ly if
t
he edit
o
r
fails to l
a
unch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Steph
e
n Boyd
technical-docs:
d
ocume
n
t has
h
A
PI
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen
B
oyd
api-str
b
uf
.
txt: fix t
y
pos and docum
e
nt
l
a
u
n
c
h_editor()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C Hamano
Git 1
.
6
.
6
-
rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Hamano
Me
r
ge branch
'
maint' to sync with
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C
H
amano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C
Hamano
w
orkt
r
ee: don't segfaul
t
with an
a
bsol
u
te pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
e
ff King
ignore
unknown col
o
r
c
o
nfigur
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Joh
a
nnes Sixt
h
e
l
p
.
autocorrect:
d
o
not
r
u
n
a co
m
mand if the comma
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shirai
s
hi
I
l
lustrate "filter" attribute with
an exam
p
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björ
n
Gustav
s
son
bash: Support new 'git fetch' opti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C
H
amano
U
p
date Releas
e
N
o
t
es f
o
r 1
.
6
.
6 to remove old
bugfixes
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
J
unio C Hamano
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
m
ano
F
ix archi
v
e for
m
at with -- o
n
t
he
command lin
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Hamano
Remove post-
u
pl
o
a
d
-hoo
k
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
Junio C Hamano
Mer
g
e
g
i
t://repo
.
o
r
.
cz
/
git
-
g
u
i
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Me
r
g
e
git://git
.
kern
e
l
.
org/pu
b
/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
U
pdate dr
a
ft re
l
e
a
se notes to 1
.
6
.
6
before
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Merge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge
b
ranch
'mm/maint-merge-ff-error
-
message-fix
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merg
e
b
r
anch 'jn/maint-pull-rebase-error-mess
a
ge' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
r
ge
b
r
an
c
h '
j
k/maint-add-p-delete-fix'
into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Haman
o
Merge git://g
i
t
.
bogom
i
ps
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio
C
H
a
ma
n
o
Revert recent "git
me
r
ge <m
s
g> HEAD <commit
>
.
.
.
"
depreca
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Je
f
f K
i
ng
a
d
d-interactive: fix
deletio
n
of
n
o
n
-empty fil
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER Gábor
bash: update 'git commit'
c
ompletio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io
C
Hamano
Sy
n
c
w
ith 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Ham
a
no
G
it 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus Tor
v
alds
Fix
d
iff -B/--dirstat m
i
sco
u
nting o
f
newl
y
added contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff K
i
ng
reset: imp
r
ove worktree
safety valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
Documenta
t
i
on: Avo
i
d u
s
e of xmlto --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
archive: cl
a
ri
f
y description o
f
p
ath p
a
rameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
J
e
ff Kin
g
r
e
rere: don't segfault
on failure to op
e
n rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
unio C H
a
mano
Prepare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge
branch
'uk/maint-shortlog-encodi
n
g' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge br
a
nch 'fc/maint-format-p
a
tch-pathspec-dashe
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Mer
g
e
branch 'ap/m
a
int-merge-strategy-list
-
fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge bra
n
ch 'jc/mai
n
t
-
am-
k
eep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C Hamano
Merge branch 'rs
/
w
ork-around-grep-op
t
-insanity'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C
H
am
a
no
Merge branch
'
rj/maint-
c
ygwin-coun
t
-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branc
h
'
m
m/main
t
-hint-failed-
m
e
r
g
e'
in
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'th/maint-re
m
o
t
e-upd
a
t
e
-
help-str
i
ng' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Me
r
ge branch 'rj/maint-t9700'
into
m
ain
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Hama
n
o
Merge bra
n
c
h 'ls/maint
-
ma
i
linfo-
n
o-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge br
a
nch
'
m
o/mai
n
t-crl
f
-
d
o
c' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'th/re
m
ote-usage
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Merge bra
n
ch
'pb/ma
i
nt
-
u
s
e-
c
u
s
t
om-perl' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
er
g
e bra
n
ch
'mm/config-pathna
m
e-tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge br
a
nc
h
'bc
/
grep
-
i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
r
anch 'jk/m
a
i
n
t-break-ren
a
me-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ha
m
ano
Merge branch 'rj/maint-s
i
mplify
-
cygwin-makef
i
le' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'rg
/
doc-w
o
rkflo
w
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C H
a
mano
Merge bran
c
h
'np
/
maint-sideband-favor-s
t
atus' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Narebski
gi
t
web
:
De
s
cribe (p
o
ssible) gitwe
b
.
js
m
ini
f
icati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Hama
n
o
Documen
t
ation: xmlto 0
.
0
.
18 doe
s
n
o
t know --stringp
a
ram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herla
n
d
Fix crasher
o
n
encounterin
g
S
HA1-li
k
e non-no
t
e
in no
t
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Bra
n
do
n
Casey
t9001: u
s
e
older Ge
t
opt::Long boo
l
ean pr
e
fix '--no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brand
o
n Casey
t
4
201: use ISO885
9
-1
r
a
ther than ISO-
8
859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Kr
ü
g
e
r
p
u
ll: clarify advic
e
for the unconfigured error c
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
am
a
n
o
Merge
i
n 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Git
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C H
a
mano
Unconditionally se
t
man
.
base
.
url
.
for
.
relati
v
e
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Hamano
Merge br
a
n
c
h
'm
a
int'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentation/Makefile
:
allow m
a
n
.
base
.
url
.
for
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
Git 1
.
6
.
6-rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
v
on Brand
git
-
pul
l
.
sh:
Fix c
a
ll to g
i
t
-
me
r
ge for new
co
m
mand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Hama
n
o
Merg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prepare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
m
erge: do
n
ot add standard message when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Ha
m
ano
Do not misidentify
"
g
it merge foo HEAD"
a
s
an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Haman
o
Update draft releas
e
notes to 1
.
6
.
6
before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C H
a
mano
Me
r
ge bran
c
h
'
ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io
C
Hamano
Me
r
ge branc
h
'
j
c
/
de
p
recate-
o
ld-
s
ynta
x
-fro
m
-
m
e
rge'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io
C
Hamano
git-merge: a
d
eprecation notice of the anci
e
nt
c
o
mman
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
r
ge branch 'bw/remote-get-
r
e
f-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Ber
t
Wesarg
g
et_ref_states: strdup entries and fr
e
e
u
til in stale
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Aguilar
hel
p
: Do no
t
unneces
s
arily look for a repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michae
l
J Gruber
Documentation: 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
unio
C Hamano
Merge branch 'jn/gitweb-bla
m
e'
commit
|
commitdiff
|
tree
2009-12-01
Ja
k
ub N
a
rebski
gitweb
:
Add link to other blame implementation
in blame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jakub Na
r
ebski
gitwe
b
: Make l
i
nkin
g
to actions r
e
quiring
J
a
v
aScrip
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
Me
r
g
e branch 'fc/maint-forma
t
-
patch-pathspec-das
h
es'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Merge branch
'
m
m/main
t
-merge-f
f
-err
o
r-m
e
ssage-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Mer
g
e
b
r
a
nch 'ap/maint-merge-
s
tr
a
tegy-list-fix'
commit
|
commitdiff
|
tree
next