repo.or.cz
/
git
/
dkf.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
Ch
r
istian Coud
e
r
Docu
m
enta
t
ion: reset: add
s
om
e
missing t
a
bl
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
Fix
bit
assignment
f
o
r
C
E
_CONFLIC
T
ED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio
C
Ham
a
no
"res
e
t --merge": fix
unmerge
d
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-03
S
t
epha
n
Beye
r
r
e
set: us
e
"
u
np
a
ck_trees
(
)"
d
irectly instea
d
of "git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Christian Couder
res
e
t: add a few
t
e
s
t
s
for "git reset --merge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Christian Cou
d
er
D
oc
u
mentatio
n
: reset: add some tables
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
et:
i
mprove
mixed reset e
r
ror message wh
e
n in
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Ham
a
no
Git
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
Merg
e
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-22
David R
e
iss
Prevent git blame
f
rom segfa
u
lting on a
missing author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Juni
o
C Hamano
Git 1
.
6
.
6
-
r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
J
unio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2009-12-20
B
j
örn
G
u
s
tavsson
rebase
-i: abort cleanly if t
h
e
editor
f
ails to
l
aun
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
technical-d
o
c
s: d
o
cument h
a
sh
A
PI
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
S
t
ephe
n
B
oyd
api-st
r
buf
.
txt: fix typos
a
n
d document lau
n
c
h_editor()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Hamano
Git 1
.
6
.
6-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C Hamano
Merge bra
n
ch 'maint'
t
o sync with 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
Junio C Hamano
wor
k
tree: don't s
e
gf
a
ult with an
a
bsolute
p
aths
p
ec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff
K
ing
ignor
e
unk
n
own co
l
or confi
g
u
r
a
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
o
hannes Sixt
help
.
a
u
t
ocorr
e
ct: do not run a command i
f
the command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Na
n
ako Shiraishi
I
l
lustr
a
te "fil
t
er" at
t
ribut
e
with an e
x
ample
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björn Gustavsso
n
bash: Sup
p
o
r
t new 'git f
e
tch' op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C H
a
mano
Update Release Notes for
1
.
6
.
6
to remove
o
l
d
bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Ha
m
ano
Sync
with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
H
amano
Git
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o
C
Hamano
F
ix archive format with -- on the comman
d
l
i
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C Haman
o
R
e
move pos
t
-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
G
i
t 1
.
6
.
6
-
r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Mer
g
e
git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C
Hama
n
o
M
e
rge git://git
.
kernel
.
org/p
u
b/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Update draf
t
r
elease note
s
to 1
.
6
.
6 before -r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
n
o
M
erge branch '
m
a
int'
commit
|
commitdiff
|
tree
2009-12-09
Junio C
Ham
a
no
Merge b
r
a
n
ch 'mm/maint-merge-ff
-
er
r
or-
m
essag
e
-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge b
r
a
nch
'jn/maint-p
u
l
l-rebase-e
r
ror-messag
e
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C H
a
m
a
n
o
M
erge bra
n
ch 'jk/
m
aint-add-p
-
delete-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
Merge g
i
t://git
.
bogomips
.
org
/
git-sv
n
commit
|
commitdiff
|
tree
2009-12-08
Junio C
Ha
m
ano
Revert
r
ecent "git
merge
<msg
>
HEAD
<
c
o
mmit>
.
.
.
" de
p
rec
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-interac
t
ive
:
fix
deletion of
non-empty file
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
SZ
E
DE
R
Gábor
bash: update '
g
it commi
t
'
comple
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Syn
c
with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
u
nio
C
Hamano
Git
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Lin
u
s Torvalds
F
i
x diff -B/--dirstat mis
c
ounti
n
g of newly a
d
d
ed contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: improv
e
w
orktree safet
y
valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zul
l
inger
Docume
n
tatio
n
: Av
o
id u
s
e of x
m
lto --s
t
r
i
ngpa
r
am
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
R
e
né Scharfe
ar
c
hi
v
e: clarify
description of path parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere: d
o
n't segfault on
f
ailure to open rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
M
erge branch
'
maint
'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Pre
p
are for
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branc
h
'uk
/
m
aint
-
shor
t
log
-
encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Merge branch
'
fc/maint-forma
t
-pa
t
c
h-pa
t
hspec-
d
ashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'ap/maint-merge-st
r
a
tegy-list-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C Hama
n
o
Merge branc
h
'
jc
/
m
a
in
t
-am-
k
e
e
p'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch 'rs/work-around-g
r
ep-opt
-
insanity
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Ham
a
no
M
e
rge br
a
nch 'rj/
m
aint-cygwin-cou
n
t-obj
e
cts' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge br
a
nc
h
'mm/maint-h
i
n
t-failed-merge' into
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
M
e
rge branch 'th
/
maint
-
remo
t
e-
u
p
da
t
e-help-stri
n
g'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C H
a
mano
Mer
g
e bra
n
c
h 'rj/maint-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
H
aman
o
Merg
e
branch 'l
s
/ma
i
nt-
m
ailinfo-no-
i
nbody' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'mo/mai
n
t-crlf-doc' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
no
Merge branch 't
h
/remote-usage' in
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
H
a
m
ano
Merge
branch 'p
b
/maint-
u
se-custom-perl' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge bra
n
ch 'mm/confi
g
-pathname-tilde-expand'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
H
amano
Merge b
r
anch '
b
c
/grep-i-F'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge
bran
c
h
'jk
/
mai
n
t-bre
a
k-rena
m
e-reduce-memo
r
y'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch 'rj
/
m
a
in
t
-si
m
plify-cygwin-m
a
kefile'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
no
Me
r
ge b
r
anch 'rg/doc-work
f
low' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Ham
a
n
o
Merge br
a
nch 'np/maint-side
b
and
-
fa
v
o
r-status
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub N
a
r
e
b
s
ki
g
i
tweb: Describe (po
s
s
i
ble)
gitweb
.
js minification
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C
H
amano
Documentation: xmlto 0
.
0
.
18 does not know --stri
n
g
p
ara
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
o
han Herland
Fix
c
rashe
r
on encountering SHA1-like no
n
-
note in notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t9001: use old
e
r
G
et
o
p
t
::Long boolean
p
refix '
-
-no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brand
o
n Cas
e
y
t4201: use ISO88
5
9-1 rather
t
han ISO-8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
a
n Krüger
p
ull:
c
l
arify advice for
the un
c
onf
i
gured error c
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ha
m
ano
Me
r
ge in
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ham
a
no
G
i
t 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Uncon
d
itional
l
y
set man
.
base
.
url
.
for
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
m
a
n
o
Merg
e
branch '
m
ai
n
t
'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Docum
e
nta
t
i
o
n/Makefil
e
: a
l
low man
.
base
.
url
.
f
or
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
a
m
ano
Git 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
von
B
ra
n
d
git-pull
.
sh:
F
i
x call to git-
m
e
rge for new
comma
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io
C Haman
o
Prepar
e
f
o
r 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
i
o
C Hamano
merg
e
: do not
a
dd
s
tand
a
r
d message when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hama
n
o
Do
no
t
misi
d
enti
f
y
"
g
it merg
e
f
oo
HEAD" as an old-styl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update dra
f
t release notes
to 1
.
6
.
6 befo
r
e
-rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
no
Merg
e
branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Haman
o
Merg
e
br
a
nch 'jc/dep
r
ecate-old-syntax-fro
m
-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
git-me
r
ge:
a
d
e
precati
o
n notice
o
f
t
he ancient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Mer
g
e branch 'bw/r
e
mote-get-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert
Wesarg
get_re
f
_s
t
ates: strdup
e
n
tries and fr
e
e util in stale
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d
A
guilar
help: D
o
no
t
unnecessarily look for a repository
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
Juni
o
C Hamano
M
e
r
ge
branch
'jn/gitwe
b
-blame'
commit
|
commitdiff
|
tree
2009-12-01
Jakub
N
arebski
gitweb: Add
l
ink
to ot
h
er blame implement
a
tion in b
l
a
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jakub N
a
rebski
gitweb: Mak
e
linki
n
g to actions requir
i
ng
J
av
a
Script
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C Hamano
Me
r
ge br
a
nch 'fc/main
t
-f
o
rma
t
-patch-pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio
C
H
a
m
ano
Merge branch 'mm/maint-merge-ff-error
-
mess
a
ge-f
i
x
'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hamano
Merge branch 'a
p
/maint-mer
g
e-strategy-
l
ist-f
i
x'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
M
e
rge br
a
nch 'jc/pretty-lf'
commit
|
commitdiff
|
tree
next