repo.or.cz
/
git
/
git-svn.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
Christ
i
an C
o
ude
r
Docume
n
tation:
rese
t
:
add some missing tables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
Fix b
i
t assig
n
ment
f
o
r
C
E_
C
ONFLICTED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Ha
m
a
n
o
"res
e
t
--merge
"
: fix
u
nmerged
c
ase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-03
Stephan Beyer
reset: u
s
e
"unpack_trees()" d
i
rectly ins
t
ead of
"gi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Christian Co
u
der
r
e
set: add a few
tests for
"git r
e
s
e
t --merge"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Christian
Co
u
de
r
Documentation: reset: add some t
a
b
l
es
to d
e
scribe the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
C
hristia
n
Coud
e
r
re
s
et: improve
m
ixed re
s
et error message
w
hen in a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Hamano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
J
u
nio
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-12-22
Dav
i
d Reis
s
Prevent git blam
e
from segfaulting on a missing aut
h
or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
Hamano
Git 1
.
6
.
6-rc
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
io C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
B
j
ö
rn Gu
s
t
a
vsson
r
e
b
ase -i: abort cleanly if the editor fa
i
ls t
o
la
u
n
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
tec
h
ni
c
al-docs: docu
m
ent hash AP
I
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Step
h
e
n
Boyd
api
-
s
t
rbu
f
.
txt: fix typos
an
d
do
c
ument launch_
e
ditor(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
unio
C
H
amano
Git 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
Merge
b
ran
c
h 'mai
n
t'
to
s
y
nc
with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C Hamano
Gi
t
1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
unio
C
Hama
n
o
worktree: don't segfault with an absolute
p
athspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
eff Kin
g
ig
n
ore unkno
w
n col
o
r
c
on
f
iguration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johann
e
s Sixt
h
elp
.
autocorrect:
d
o not run a command if th
e
c
o
m
m
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shiraishi
I
l
l
ustrate "filter
"
attribute with a
n
example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Björn Gust
a
v
s
son
bash
:
S
u
ppo
r
t
n
e
w 'g
i
t
f
et
c
h
' options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio
C Hama
n
o
U
pdate Release
Notes for 1
.
6
.
6 to
r
emove old bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Ha
m
ano
Sync wit
h
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C Hamano
Fix archiv
e
format w
i
th -- on the c
o
mmand line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
Hamano
R
e
move post-upload-hook
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 H
a
ma
n
o
Merge git:/
/
repo
.
o
r
.
cz/
g
i
t
-
g
u
i
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git:/
/
git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hama
n
o
U
p
d
ate dra
f
t release notes t
o
1
.
6
.
6
before -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io C Hamano
Merge branch 'mm/maint-merge-f
f
-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
M
e
r
g
e branch 'jn/maint
-
pull-rebase-error-message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
Merge
b
ranch 'jk/maint-add-p-delete
-
f
i
x' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Ha
m
ano
Merge git:
/
/git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Ham
a
no
Revert recent "git merge <msg> HEAD <commit>
.
.
.
"
deprecatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
Jef
f
Ki
n
g
add-interactive: fix deletion of
non-e
m
pty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER Gábor
b
ash: update '
g
it
commit' co
m
pletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
Hamano
Sync with
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io
C Hama
n
o
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torvalds
Fix diff -B/--dirstat miscounting of ne
w
ly added
contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
e
ff King
res
e
t: im
p
rov
e
w
o
r
k
tree safety valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
D
ocumentatio
n
: Avo
i
d
u
se of
xmlto --stringp
a
ram
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
archive
:
clarify d
e
scription of path parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff K
i
ng
r
erere: don't segfault on fa
i
lure to open rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ham
a
n
o
P
r
e
par
e
for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Me
r
ge bran
c
h '
u
k/mai
n
t-shortlog-enco
d
ing' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
M
erge b
r
anc
h
'fc/ma
i
nt-format-patch-
p
athspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'a
p
/maint-merge-strategy-list-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branc
h
'jc
/
maint-a
m
-keep' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hama
n
o
Mer
g
e
b
r
anch 'r
s
/work-around-grep-
o
pt-insan
i
ty' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
aman
o
Merge branch 'rj/mai
n
t-cygwin
-
coun
t
-obj
e
cts' in
t
o
main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge branch '
m
m
/
m
a
i
nt-hint-failed-m
e
rge' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'th/maint
-
remote-update-h
e
l
p-st
r
ing
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ran
c
h
'rj/maint-t
9
70
0
' int
o
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
ma
n
o
Merge branch
'
ls/maint-ma
i
linfo-no-inb
o
dy' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Haman
o
Merge b
r
anch 'mo
/
maint-crlf-doc' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
mano
Merge branch 'th/rem
o
te-u
s
age' i
n
to
m
ain
t
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'p
b
/maint-us
e
-custom-pe
r
l' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
M
e
rge branch
'
mm
/
c
o
n
fig-pathname-tilde-expan
d
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
H
ama
n
o
Merge branch 'bc/gre
p
-
i
-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ha
m
ano
Merge branch
'
j
k
/
m
a
int-br
e
ak-renam
e
-redu
c
e
-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch
'
rj/maint-simpl
i
f
y
-cygwin-makefile' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
ch 'rg
/
doc-workflow
'
into
maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
M
erge branch 'np/maint-sid
e
band-favor-st
a
tus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Nar
e
bski
git
w
eb: Describe (possi
b
le) gitweb
.
js mi
n
i
fi
c
a
tio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Docum
e
ntatio
n
: xm
l
to
0
.
0
.
1
8
does
n
ot know --stri
n
g
p
aram
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Joh
a
n
Herland
F
i
x c
r
asher
on encoun
t
ering SHA1-like
no
n
-not
e
in
n
o
t
es
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t9001
:
use o
l
der G
e
topt::Long boo
l
ean
p
re
f
i
x
'--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
B
r
ando
n
Casey
t4201:
u
se ISO885
9
-1 rathe
r
than ISO-88
5
9-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüge
r
pull: clarify a
d
v
ice
f
or th
e
u
nconfigured error case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge i
n
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
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
Un
c
o
nditio
n
ally set man
.
base
.
url
.
for
.
rel
a
tive
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Gi
t
1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
H
o
r
st H
.
von Bran
d
gi
t
-pull
.
sh: Fi
x
c
al
l
to git-
m
erge for new co
m
mand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
i
o
C Hamano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Prepare f
o
r
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 not ad
d
standard message whe
n
message
i
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C
Ham
a
n
o
Do not misidentify
"
git merge foo HE
A
D
" as an old
-
style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
U
p
date draf
t
r
elease
n
o
tes to
1
.
6
.
6
bef
o
re -
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
a
mano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
J
unio
C
Hama
n
o
Merge bran
c
h 'jc/depreca
t
e-old-sy
n
tax-fr
o
m
-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
git
-
merg
e
: a deprecation notice o
f
the ancient command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
Mer
g
e branc
h
'bw/remote-get-ref-stat
e
s
-fi
x
'
commit
|
commitdiff
|
tree
2009-12-01
B
e
rt Wesarg
ge
t
_ref_
s
tates
:
strdup
e
ntries an
d
f
ree util
in s
t
ale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do
no
t
unnecessari
l
y look for a reposit
o
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
M
i
chael 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
Junio C Hamano
M
erge branch 'jn/git
w
e
b
-
blame'
commit
|
commitdiff
|
tree
2009-12-01
Ja
k
ub Nareb
s
ki
g
itweb: Add link to
other bla
m
e
i
m
p
lementatio
n
in blame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jak
u
b N
a
r
e
b
ski
gitweb: Mak
e
linki
n
g
t
o actio
n
s r
e
quiring JavaScript
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C
Hamano
Mer
g
e branch 'fc/maint-for
m
at-patch-p
a
thspec
-
dashes'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o
C H
a
mano
Merge br
a
nch 'mm/maint-merge-f
f
-error-m
e
ssage-fix'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hama
n
o
M
e
r
ge branch
'
ap/maint-mer
g
e
-
stra
t
egy-lis
t
-fi
x
'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Ha
m
ano
Merge br
a
nch 'jc/pretty-
l
f'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
Merge branc
h
'cc/bisect-d
o
c
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Merge
b
r
a
nch '
e
m
/
c
ommit-claim'
commit
|
commitdiff
|
tree
next