repo.or.cz
/
git
/
jrn.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
C
hristian
C
ouder
Documentation: reset: add
some
m
i
ss
i
ng tables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
J
unio C Hamano
Fix bit as
s
ig
n
m
e
nt for CE_CONFLICTED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
J
u
nio C Hamano
"reset
-
-
me
r
g
e": fix unmerged case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-03
Stephan Beyer
reset
:
us
e
"un
p
ack_tr
e
es()" directly instead of "git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Chri
s
tian Couder
reset: ad
d
a few te
s
t
s
fo
r
"gi
t
r
ese
t
--merge
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Christian Couder
Docu
m
entation:
reset: add som
e
table
s
t
o describe the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Christian Couder
rese
t
: improve mi
x
e
d reset error message when
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
Ham
a
n
o
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
Prevent git blame from segfaulting on a mis
s
ing author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C
H
aman
o
Gi
t
1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Merge branch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2009-12-20
B
jörn Gustavsso
n
rebase -i: ab
o
rt
cleanly if the editor fails to launch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen B
o
yd
t
e
ch
n
ical-docs
:
document hash
API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
St
e
phen
Boy
d
api-strbuf
.
txt:
f
ix
t
ypos an
d
d
ocument launch_editor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio 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
unio C Hamano
Me
r
ge branch 'maint' to sync wit
h
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
J
un
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
Junio C
Ham
a
no
wo
r
ktree
:
don't segfault with an absolute path
s
p
ec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
i
g
nore
u
nknown c
o
lor configura
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Joha
n
nes
S
i
x
t
help
.
autoc
o
rrec
t
: do
not run a command if the c
o
mmand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shira
i
shi
Ill
u
s
t
rate "filter" at
t
ribut
e
w
ith
a
n example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Björn Gusta
v
sson
ba
s
h: S
u
p
p
ort new 'gi
t
fetch' opti
o
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
J
u
n
io
C Hamano
Update Release Notes for 1
.
6
.
6 to remove old bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Ju
n
io C Hamano
Sync with 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
i
o
C Hamano
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ham
a
no
Fix archi
v
e format with -
-
on the command lin
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Hamano
Remo
v
e post-uploa
d
-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-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Haman
o
Merge git://repo
.
or
.
cz/git
-
gu
i
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
n
o
Merge g
i
t://git
.
kernel
.
org/pu
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Update draf
t
re
l
eas
e
not
e
s to 1
.
6
.
6 before -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
man
o
M
e
rge
b
ra
n
ch 'mm
/
maint-me
r
ge-ff-erro
r
-m
e
ssage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
Merge branch 'jn
/
maint-pull-rebase-err
o
r-messag
e
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io C Ham
a
no
Merge b
r
anch '
j
k/mai
n
t
-
a
dd-p
-
delete
-
fix' in
t
o
m
aint
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o
C
Ham
a
no
Merge
g
it://g
i
t
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C
Ham
a
no
Revert recen
t
"git m
e
rge <ms
g
> HEA
D
<commit>
.
.
.
" deprecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
J
e
ff King
add-
i
nteractive: fix
d
eletion of
n
on-empty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER
G
ábor
bas
h
:
updat
e
'git
c
ommit' completio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
u
nio C Hamano
Sync with
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Li
n
us Torv
a
lds
F
i
x di
f
f -B/
-
-dirst
a
t miscounti
n
g of ne
w
ly added contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: imp
r
ove work
t
ree
s
afety
v
a
lves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Z
u
llinger
Documentation: Avoid us
e
of xmlto --
s
tri
n
gparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René Sch
a
r
f
e
archive:
clar
i
fy
description of pat
h
pa
r
ameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere:
d
on't
segfault o
n
f
a
ilure to open rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Haman
o
Prepare for
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch
'uk/maint-shortlo
g
-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge
b
ranch '
f
c
/
maint-format-
p
a
t
ch-
p
athspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Hamano
Merge branch 'a
p
/main
t
-merge
-
str
a
tegy-l
i
st-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C Hamano
Merge branch 'jc
/
ma
i
n
t
-am-keep' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'
rs/work
-
a
r
ound-grep-opt-insanity'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
n
o
Merge
branch '
r
j/
m
aint-cygwin-co
u
n
t-objects'
i
nto
main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branc
h
'
mm/maint-hint-fa
i
led-
m
erge'
i
nto
maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
M
erge br
a
nc
h
'th/maint-remote-update-
h
e
l
p
-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hama
n
o
Merge branch
'rj/maint-t9700' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'ls/maint
-
mailin
f
o-no-inbody' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch 'mo/maint-crl
f
-doc'
i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ham
a
no
Merge
bra
n
ch 'th/r
e
mote-usage' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge b
r
anch 'p
b
/maint-use-
c
u
s
tom-perl' in
t
o main
t
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge br
a
nch 'mm/con
f
ig-pathname
-
til
d
e-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge br
a
nch 'bc/
g
r
e
p-i-F'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
c
h
'jk/maint-b
r
e
a
k-rename-reduce-memor
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C Hama
n
o
Me
r
g
e
branch
'
rj
/
mai
n
t-s
i
mp
l
ify-cygwin-makefile
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch 'rg/doc-wo
r
kflow' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'np/maint-sid
e
band-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Nare
b
s
k
i
gitwe
b
: Describ
e
(po
s
sib
l
e)
g
i
t
we
b
.
j
s
m
in
i
fication
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
Haman
o
Documentation:
x
mlto 0
.
0
.
18 does not know --stringp
a
ram
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Her
l
and
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 Case
y
t
900
1
: use ol
d
er Get
o
pt::
L
ong boolea
n
prefix '--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Bran
d
on Casey
t4201: use IS
O
8859-1 rat
h
er
t
ha
n
ISO-8859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan
Krü
g
er
pul
l
: clari
f
y advice for the unconf
i
gured
error case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Hamano
Merge in 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
unio
C
Hamano
Unc
o
nditionally set ma
n
.
base
.
url
.
for
.
r
e
la
t
ive
.
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
Horst H
.
v
o
n Brand
g
i
t-pull
.
s
h: Fix call to git-merge for new
c
ommand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
i
o
C
Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
ama
n
o
Prepare for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C Haman
o
merge: do not add
s
tandard messag
e
when message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
D
o 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
pd
a
te d
r
aft release notes to 1
.
6
.
6 before -
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C H
a
m
a
n
o
Merge b
r
a
nch
'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Hamano
Merge bra
n
c
h
'
j
c/
d
eprecate-old-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Ha
m
a
no
git-me
r
ge: a d
e
preca
t
ion noti
c
e
of the ancie
n
t c
o
mma
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
amano
Merge branch 'bw/remote-g
e
t-ref-
s
tate
s
-
f
i
x'
commit
|
commitdiff
|
tree
2009-12-01
B
ert W
e
sarg
get_ref_stat
e
s: strd
u
p en
t
rie
s
and fr
e
e util in stale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id Ag
u
il
a
r
help: Do
not u
n
n
e
c
essarily look for
a
re
p
o
s
itory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Micha
e
l J Gruber
Docu
m
e
nt
a
tion: Fix a
f
ew
i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Mer
g
e br
a
nch 'jn/gitweb-b
l
a
m
e'
commit
|
commitdiff
|
tree
2009-12-01
J
a
k
ub Narebski
gitweb: Add
l
i
n
k
to other
b
la
m
e
implementati
o
n in b
l
a
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
akub
Narebski
gitw
e
b: Make linking t
o
actions requirin
g
JavaScri
p
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio
C
H
a
ma
n
o
M
e
r
ge bra
n
c
h
'fc/
m
aint-format-patch-pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
Merge branch 'mm/
m
ai
n
t-merge
-
ff-e
r
ror-me
s
s
a
ge-fix'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C
H
amano
Merge branch
'
ap/main
t
-mer
g
e-st
r
ategy-l
i
st-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Merge branch 'jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
m
a
no
M
erge branch '
c
c/bis
e
ct-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
b
r
a
nch 'em/
c
ommit-clai
m
'
commit
|
commitdiff
|
tree
next