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
Christian Couder
D
ocumentation: reset: add
some
m
i
ssing tables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
Fi
x
bit assi
g
n
m
e
nt for CE_CONFLICTED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Haman
o
"
r
e
s
et --merge"
:
fix unmerged
c
a
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-03
Step
h
an B
e
yer
r
e
s
et: use "
u
npa
c
k_tree
s
()" directly
instead of "gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
C
h
ristian Couder
reset
:
a
d
d a few tests
for "
g
i
t
reset --merge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Chr
i
s
t
ian Coude
r
Docume
n
ta
t
ion: rese
t
:
add
so
m
e tables to descr
i
be
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Ch
r
istia
n
Couder
reset: improv
e
mixed r
e
set error m
e
s
s
age wh
e
n in a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
J
unio
C Haman
o
Git
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
M
erge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-22
Da
v
id Re
i
ss
Prevent git
blame fro
m
segfaulting on a m
i
ssi
n
g au
t
h
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
io C Hamano
Gi
t
1
.
6
.
6-r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Merge b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2009-12-20
Björ
n
Gustavsson
rebase -i
:
abort
cleanly if the edit
o
r fail
s
to
l
aun
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
S
t
ep
h
en Boyd
technical-d
o
cs
:
d
o
cume
n
t hash API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
S
tephe
n
Boyd
api-strbuf
.
txt:
f
ix typos and docu
m
ent launch
_
editor()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
unio C Hama
n
o
Git 1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
u
n
io C
Hamano
M
erge branch 'm
a
int' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C Haman
o
G
i
t 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
worktree: don
'
t
segfault with an absolute
p
a
t
hspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff Ki
n
g
ignor
e
unknown colo
r
c
onfiguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
o
ha
n
nes Si
x
t
hel
p
.
autocorrect:
d
o n
o
t run a command if the
command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nan
a
k
o Shiraishi
Illustrate "
f
i
l
te
r
" attr
i
b
u
te
w
ith an example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björ
n
G
u
stavsson
bash: Support new 'git fetch
'
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C
H
a
m
ano
Update Release Notes fo
r
1
.
6
.
6
to rem
o
v
e
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
Junio C H
a
mano
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
ch
i
ve form
a
t with -- on the
c
ommand line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Ha
m
an
o
R
e
move post-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
i
o
C Hamano
Git 1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C
Ham
a
no
M
e
r
ge git:
/
/r
e
p
o
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
m
ano
M
erge git://gi
t
.
ke
r
nel
.
org/pub/scm/gitk/git
k
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Update draft release notes to 1
.
6
.
6
b
e
fo
r
e
-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
Mer
g
e branch 'mm/maint
-
merge-ff
-
error-me
s
sage
-
f
i
x'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
M
erge branch 'jn/maint-pull-rebase-
e
rror-message' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
unio
C
Hamano
Merge br
a
nc
h
'jk/maint-add-p-delete-fix'
i
nto
maint
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
M
erge git://
g
it
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
J
uni
o
C
Hamano
Revert recen
t
"git mer
g
e <msg> HEAD
<commit>
.
.
.
"
deprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Je
f
f King
add-interactive:
f
ix
d
eletion of non-empt
y
files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER Gábor
ba
s
h: update 'git commit
'
com
p
letion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
H
amano
S
y
nc with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jun
i
o C
Hamano
G
it 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Li
n
u
s
T
o
r
v
alds
Fix
diff
-
B
/
-
-
dirs
t
a
t mis
c
ounting
o
f newly added
c
ontents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Je
f
f King
reset:
impro
v
e
w
o
r
k
t
r
ee safety valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
Documentation: Avoid use of xmlto
-
-
string
p
aram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René
S
charfe
archive
:
c
lar
i
f
y desc
r
iption
o
f
path
paramet
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Je
f
f Ki
n
g
rer
e
re:
don't segfault on failure
t
o o
p
e
n
r
r-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Prepare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch
'
uk/maint-shortlog-e
n
coding'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branc
h
'fc/
m
aint-form
a
t-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch 'ap/
m
a
int-
m
erge-stra
t
egy
-
l
i
st-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ha
m
ano
Merge branch
'
j
c/
m
aint-
a
m
-keep' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Mer
g
e branch 'rs/work-around
-
grep-opt-insanity' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
a
mano
Mer
g
e branch '
r
j/maint-cygwin-count-ob
j
ects
'
into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Merge branc
h
'mm/m
a
int-hint
-
failed-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge br
a
nch 'th/main
t
-
r
emote-
u
pdate-help-s
t
r
i
ng' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
M
erge branch
'
rj/maint-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge b
r
anch 'ls/maint-ma
i
li
n
fo-no-inbody' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
n
o
Merge
b
ranch 'mo/maint-
c
rlf-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
a
n
ch '
t
h/r
e
mote-us
a
ge' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'pb/maint
-
use-custom-perl' into
ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Haman
o
Merge branch '
m
m/co
n
fig-
p
at
h
name-tilde-expa
n
d'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
r
an
c
h
'bc/grep-i-F'
i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch 'jk/maint-br
e
ak-rename-reduce
-
memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'rj/maint-si
m
plify
-
c
y
gwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
aman
o
Merge bra
n
ch 'rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'np/m
a
in
t
-sideband-fa
v
o
r-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Narebski
gitweb: Desc
r
ibe (possibl
e
)
git
w
eb
.
js min
i
fication
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Documentati
o
n: xmlto 0
.
0
.
18 doe
s
not know --stringpara
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fi
x
c
r
asher on encounteri
n
g
SH
A
1-
l
ike
n
on
-
no
t
e in notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Br
a
ndon
Casey
t9
0
01:
u
s
e
older Getopt::Long boole
a
n prefix '--no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Cas
e
y
t4
2
01: use
ISO885
9
-1 rathe
r
th
a
n
ISO-8
8
59-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüg
e
r
pul
l
: clarify
a
dvice for the un
c
onfig
u
re
d
err
o
r
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
n
o
M
erge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Unconditiona
l
ly set man
.
base
.
u
r
l
.
for
.
relative
.
lin
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
D
o
cumentation/M
a
kefile:
allow
man
.
b
a
se
.
url
.
for
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
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
H
o
rst H
.
von Bra
n
d
git-
p
ull
.
sh: F
i
x call to g
i
t-merge for
new co
m
m
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
aman
o
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hamano
P
r
epare 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 no
t
add stan
d
ard message
when message i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C Haman
o
Do
not
m
isiden
t
ify "git merge foo HEAD" a
s
an old-st
y
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Update draft release notes
t
o 1
.
6
.
6 b
e
fore
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
no
Me
r
ge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Haman
o
Merge
branch 'jc/deprec
a
t
e
-o
l
d
-syn
t
ax-fro
m
-mer
g
e'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
git-
m
erge: a deprecation
n
otice
o
f the ancient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C H
a
mano
M
erg
e
branch 'bw/remot
e
-get-ref-state
s
-
f
i
x'
commit
|
commitdiff
|
tree
2009-12-01
Bert
Wesa
r
g
g
e
t_ref_sta
t
e
s
: strdup ent
r
ies and free util
in
stale
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
D
avid Aguilar
help: Do not un
n
ecessa
r
ily look for a repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
M
i
chael J
Gr
u
be
r
D
o
cume
n
t
a
tion: Fix a few
i
.
e
.
/
e
.
g
.
mix-up
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C
Hamano
Merge branch 'jn/git
w
eb
-
b
l
ame'
commit
|
commitdiff
|
tree
2009-12-01
Ja
k
u
b Nar
e
bski
gitweb: Add
l
i
nk to ot
h
er blam
e
implementation
in b
l
ame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jakub
Nar
e
b
ski
g
itweb: Make
l
inking to
a
ctions
requi
r
ing JavaScript
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
H
a
mano
Merge branch 'f
c
/maint-format-patch-pathspec-dashes
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Haman
o
Merge branch 'mm
/
ma
i
nt-merg
e
-ff-
e
rr
o
r
-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Me
r
ge bra
n
ch 'ap/m
a
int-m
e
rge-stra
t
egy
-
list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
b
r
a
nch 'jc/pretty-lf'
commit
|
commitdiff
|
tree
next