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
reset: add a few tests for "git reset --merge"
2009-12-30
Christian Couder
r
e
set: add
a few te
s
ts for "g
i
t reset --m
e
rge
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Christ
i
an
C
ouder
Documentation: re
s
et: add some tab
l
es to
d
escribe the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Christian
C
ouder
reset: improve m
i
xed r
e
set e
r
ror
m
essage when in a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Haman
o
Gi
t
1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Jun
i
o
C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-22
David
R
eiss
Prevent git blame from seg
f
aulting on a
m
iss
i
ng author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C
H
aman
o
Git 1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Juni
o
C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Björn
Gustavsson
rebase -i: abo
r
t c
l
ean
l
y if
the editor fails
to l
a
unch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Bo
y
d
technical-docs: document ha
s
h
A
P
I
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen
B
oyd
api-s
t
rbuf
.
txt: f
i
x ty
p
os and do
c
u
ment launch_edi
t
o
r()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C
H
a
mano
Git
1
.
6
.
6-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio C Ha
m
ano
M
e
rge branch 'maint' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
J
unio 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
worktree: don't segfault
w
ith an abso
l
u
t
e pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Je
f
f King
i
gn
o
re unknown color configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johannes Sixt
help
.
a
u
tocorre
c
t: d
o
no
t
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
N
a
na
k
o Shir
a
ishi
I
l
lustrat
e
"
f
ilter" a
t
tribute with an example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
B
j
ö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
Jun
i
o C Hamano
Updat
e
R
e
l
ease
N
otes for 1
.
6
.
6 to remove old
b
ugfixes
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 Haman
o
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Hamano
F
ix
archive for
m
at
w
ith
-
-
on the co
m
mand
l
ine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Rem
o
v
e
pos
t
-upload-hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git 1
.
6
.
6
-
rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Merg
e
gi
t
://repo
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
M
erge gi
t
://git
.
kernel
.
org/pub/scm
/
gitk/gi
t
k
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Updat
e
draft release notes to 1
.
6
.
6
b
efore -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
Merge
branch 'ma
i
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 Hamano
Merge
b
r
anch 'jn
/
maint-pull-reb
a
s
e
-
error-messa
g
e' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
m
a
no
Merge branch 'jk/
m
ain
t
-
a
dd
-
p-delete-
f
ix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Merge git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Revert
recent
"
git merge <m
s
g> HEAD <co
m
mit>
.
.
.
"
dep
r
e
cati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
J
e
ff Ki
n
g
add-i
n
teractive: fi
x
delet
i
on of non-empty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER
Gábor
bash: update 'git commit' c
o
m
pletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Sync w
i
th 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C H
a
mano
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
/
-
-
d
i
rstat miscou
n
ting of
newly added cont
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
e
ff Ki
n
g
r
e
set: improve wor
k
tree saf
e
ty valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zu
l
linger
Documentation: Avoid use of xmlto --s
t
rin
g
param
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Re
n
é Scharf
e
archive: clarify de
s
cription of
p
a
th paramete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jef
f
King
rerere: don
'
t segf
a
ult
o
n failure t
o
open rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
M
erge br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
P
repare for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C H
a
m
ano
Me
r
g
e branch 'uk/
m
a
i
nt-shortlog-e
n
coding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
Merge br
a
nch 'fc/maint-
f
ormat-p
a
tch-path
s
pec-da
s
hes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'ap/mai
n
t-merge-str
a
tegy-list-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge bran
c
h 'jc
/
m
a
int-
a
m-keep'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e bra
n
ch 'rs/w
o
r
k
-
aroun
d
-
grep-opt
-
in
s
anity' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'r
j
/ma
i
nt-cygwin
-
c
o
unt
-
objects' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C Hamano
Merg
e
bra
n
ch 'mm/
m
aint-hint-fa
i
led-merge' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Hamano
Merge
bran
c
h 'th/maint-remote-update-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ham
a
no
Merge branch '
r
j/m
a
int-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch '
l
s/maint
-
mailinfo-no-
i
nbody' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ha
m
a
no
Mer
g
e branch
'
m
o/maint
-
cr
l
f-doc' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Hamano
Merge br
a
nch 'th/remote-usa
g
e
' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Haman
o
Merg
e
branch 'pb/maint
-
use-custom-perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch 'mm/c
o
nfig-pathnam
e
-tilde-exp
a
n
d' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
a
n
ch 'bc/g
r
e
p
-i
-
F' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
Hamano
Merge branch 'jk/maint-break-
r
ename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge
branc
h
'
r
j
/
ma
i
n
t
-simplify-cygwi
n
-makefile' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C H
a
mano
Mer
g
e
br
a
nch 'rg/doc-workflow'
into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C
Hamano
Mer
g
e
b
r
anch 'np/ma
i
nt-sideband-favor-
s
tatus' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
akub Narebski
g
it
w
eb
:
Describe (pos
s
i
ble) git
w
eb
.
js m
i
nification
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hama
n
o
Doc
u
mentation: xml
t
o 0
.
0
.
1
8 does n
o
t kn
o
w -
-
stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
ohan Herl
a
nd
Fix crasher on encountering SHA1-like non-note
in notes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brandon C
a
sey
t
9001:
u
se older Getopt::Long boolean prefix '--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t
4
2
0
1
:
use IS
O
8859-1 rather than ISO-885
9
-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Kr
ü
ger
pul
l
:
c
larify advice
for the u
n
configu
r
ed error ca
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merg
e
i
n 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
it 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Unc
o
ndit
i
on
a
lly
set
m
an
.
base
.
u
rl
.
for
.
r
e
lat
i
v
e
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
Git 1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
von
Brand
git-pu
l
l
.
sh: Fix call to
g
it-merge for new comma
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hamano
M
e
rge
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Hamano
P
r
e
pare for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
m
e
rge: do not
add standa
r
d message
when
m
e
s
sage is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Ha
m
ano
Do not
m
is
i
den
t
ify "git merge foo HEAD" as an ol
d
-
s
tyle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
no
Update
d
r
a
ft rel
e
ase
note
s
to 1
.
6
.
6 b
e
fore -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
mano
Merge
b
ranch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C H
a
mano
Merge branch 'jc/d
e
precat
e
-old-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
g
i
t-merge:
a
deprecat
i
o
n n
o
tice
of th
e
ancient command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Hamano
Merge br
a
nch 'b
w
/rem
o
te-g
e
t
-r
e
f-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert Wes
a
r
g
get_re
f
_state
s
:
strdup entries and f
r
e
e
util i
n
s
t
ale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vi
d
Aguilar
help: Do not u
n
nece
s
sar
i
ly loo
k
for a
re
p
ository
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
.
m
ix-u
p
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Me
r
ge branch 'jn/gitweb-bla
m
e'
commit
|
commitdiff
|
tree
2009-12-01
J
a
kub Nar
e
bski
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 Narebs
k
i
gitw
e
b:
M
a
ke
l
i
n
king to
act
i
ons requiri
n
g
JavaScript
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bran
c
h 'fc/maint-forma
t
-
p
atch-pa
t
hspe
c
-dashes
'
commit
|
commitdiff
|
tree
2009-11-30
J
unio
C Hamano
Mer
g
e
branch 'mm
/
maint-merg
e
-ff-
e
r
ror-mes
s
age-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Haman
o
Mer
g
e
b
ranc
h
'ap/maint-me
r
ge-strategy-l
i
st-fix
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch
'
jc/
p
retty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Ham
a
no
Merge branc
h
'cc/b
i
sect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Hamano
Merge
b
ranch 'em/
c
om
m
it-c
l
aim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
M
e
rge bra
n
c
h 'jc/mailinf
o
-remove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bran
c
h 'fc/send-email
-
envelop
e
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Mer
g
e br
a
nch 'uk/maint-
s
hortlog
-
e
n
coding
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io
C
H
amano
Merge branch 'ns/send-email-no-cha
i
n-reply-to'
commit
|
commitdiff
|
tree
next
