repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
"reset --merge": fix unmerged case
2010-01-04
J
u
ni
o
C Hamano
"
reset -
-
merge":
f
i
x un
m
er
g
e
d
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-03
Stephan Beyer
reset:
use
"
unpack_tr
e
e
s(
)
" direc
t
ly i
n
stead
o
f "git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Christian Coud
e
r
r
e
set: add a
f
ew te
s
ts
fo
r
"
g
i
t
rese
t
--me
r
ge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Christian Couder
Documentation: reset: add some
t
a
b
les to describe the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Christian Couder
res
e
t: improve mixed reset erro
r
m
e
ssage
when in
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
J
u
n
io C
Hamano
G
i
t
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
Pre
v
ent git blame from s
e
gfaulting on a miss
i
ng author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C H
a
mano
Git 1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C Hamano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Björn Gustavs
s
o
n
rebase
-i: abo
r
t cleanly if the
e
ditor fails to launc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
tec
h
n
i
c
a
l
-docs: document h
a
sh API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
S
tephen B
o
y
d
a
p
i-str
b
uf
.
txt: fix typos and document laun
c
h_e
d
itor()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
G
it 1
.
6
.
6-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C Ha
m
ano
Merge branch 'maint' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
u
ni
o
C Hamano
workt
r
ee: don'
t
se
g
fa
u
lt with an ab
s
olute
path
s
pec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff
King
ignore unknown color configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Johan
n
es Sixt
help
.
autocorrec
t
:
do not run a
c
ommand
if the co
m
man
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shiraishi
Illust
r
a
te "filte
r
"
attribu
t
e
w
i
t
h an example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björn Gustav
s
son
bash: Support n
e
w 'gi
t
f
etch
'
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C H
a
m
a
no
Up
d
ate Rel
e
ase 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
J
unio
C
Hama
n
o
Sync with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C H
a
mano
Git
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C
Hamano
F
ix ar
c
h
i
v
e format with -- on the comman
d
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C Hamano
Remove post
-
upl
o
ad-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
Hama
n
o
Gi
t
1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Mer
g
e
git://r
e
po
.
or
.
c
z
/g
i
t-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Mer
g
e
g
i
t
://git
.
k
e
rnel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
i
o C Hamano
Updat
e
d
raft relea
s
e no
t
e
s
t
o
1
.
6
.
6 befor
e
-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C H
a
man
o
M
e
rge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
Merg
e
bra
n
c
h 'mm
/
maint
-
m
e
rge-f
f
-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Merge branch 'jn
/
maint
-
pul
l
-rebas
e
-err
o
r-me
s
sage
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge bra
n
ch 'jk/maint-add-p-delete-fix'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io C Haman
o
Merge git
:
//git
.
bogomips
.
o
rg/g
i
t-svn
commit
|
commitdiff
|
tree
2009-12-08
Jun
i
o C Hama
n
o
R
e
v
e
rt rec
e
nt
"git merge <msg>
H
EA
D
<commit>
.
.
.
" depr
e
cati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Jeff Ki
n
g
add-in
t
e
r
active: fix deletion of
n
on-empty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER Gábor
bash: upd
a
te 'git co
m
mit' c
o
mpleti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
S
y
n
c
w
ith 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jun
i
o C Ham
a
no
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
L
i
nus Torvald
s
Fix diff -B/--dirstat mi
s
counting of newly added
content
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset:
i
m
p
r
ove worktr
e
e safety valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
Doc
u
mentation: Avoid
use
o
f xmlto
-
-
stringpar
a
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
archive: clari
f
y
d
escription of
p
ath parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere: don't segfault on
failur
e
to op
e
n
rr-cac
h
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merg
e
branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
an
o
Prepare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C H
a
man
o
Mer
g
e
branc
h
'uk/m
a
int-shortlog-en
c
od
i
ng' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Merge branch
'
f
c/maint-format-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch 'ap/maint-merge-stra
t
egy-list-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
an
o
Me
r
ge branch 'j
c
/maint-am
-
keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
H
a
ma
n
o
Merge branch 'rs/work-
a
round-
g
rep-opt-insanity'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/maint
-
cygw
i
n-co
u
nt-objec
t
s' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge branc
h
'mm/maint-hint-fa
i
led-merge'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge br
a
nch 't
h
/ma
i
nt-remote-update-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch '
r
j/ma
i
nt-t97
0
0' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Mer
g
e bra
n
ch 'ls/maint-mailinf
o
-no-inbody'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ran
c
h 'm
o
/
m
aint
-
crlf-doc'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge bra
n
ch '
t
h/remote-u
s
age
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ha
m
ano
M
e
rge b
r
anch '
p
b/maint
-
use-custo
m
-perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
ano
Merg
e
bra
n
ch 'mm/config
-
pathname-tilde-expa
n
d' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branc
h
'bc
/
g
r
ep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h 'jk/m
a
int-break-ren
a
me-reduc
e
-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Haman
o
Merge
b
ran
c
h '
r
j/maint-simplif
y
-
c
ygwin-m
a
kefil
e
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge bra
n
ch 'rg
/
d
o
c-workflow'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e
b
ranch
'n
p
/ma
i
nt-sideband-favor
-
s
t
a
tus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
a
kub Na
r
ebski
gitw
e
b: D
e
scribe (p
o
ssible) gitweb
.
j
s
mini
f
i
cation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
man
o
Documen
t
ation: xmlto 0
.
0
.
1
8
does
n
ot
k
now --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
o
han Herlan
d
Fix
c
rasher on encounter
i
ng SHA1-like non-no
t
e
in notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t9
0
0
1
: use
older Getopt::Long boole
a
n
p
re
f
ix '--no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
B
rando
n
Cas
e
y
t
4201: use ISO8859-1 rat
h
er
t
ha
n
ISO-
8
859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan
K
rüger
p
u
l
l: clari
f
y adv
i
ce for t
h
e unconf
i
gure
d
error
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ham
a
no
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 Hamano
Git
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
H
aman
o
Uncond
i
t
i
on
a
lly set
m
an
.
base
.
url
.
f
o
r
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documen
t
ation/M
a
kefile: al
l
ow man
.
base
.
u
rl
.
for
.
relat
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C Haman
o
Git 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
von
Brand
gi
t
-pull
.
s
h
:
F
i
x call to git-mer
g
e f
o
r
new command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
Prepare
f
or 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C
H
amano
merge: do n
o
t add standard message when me
s
sage is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Hamano
D
o
not m
i
si
d
entify
"
g
it merge
f
oo
H
EAD" as an ol
d
-st
y
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update dr
a
f
t
rele
a
se notes
to 1
.
6
.
6 bef
o
re
-
rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merg
e
branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Hamano
M
e
r
ge branch 'jc/deprec
a
t
e
-old-s
y
ntax-fro
m
-
merge'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Hamano
git-merge:
a
d
e
p
recat
i
on notice of the an
c
ient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
H
amano
Merge branch '
b
w/remote-get-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Be
r
t Wesar
g
ge
t
_ref_
s
tates: strdup
en
t
ri
e
s and free
u
t
il in s
t
ale
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
David A
g
uilar
help: D
o
not unnec
e
ss
a
rily look fo
r
a
repo
s
itor
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Mic
h
ael J Gru
b
er
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 H
a
m
ano
M
e
r
g
e
branch 'jn/gitweb-blame'
commit
|
commitdiff
|
tree
2009-12-01
Jak
u
b
Narebski
git
w
eb: Add l
i
n
k to
other bl
a
me implemen
t
at
i
on in
b
l
ame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jakub Narebski
gitweb:
M
a
ke linking to actions requirin
g
JavaScript
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Hamano
Merge
bra
n
ch
'
fc/maint-
f
ormat-patch-
p
athspec-
d
ashes'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Merge branch
'mm
/
maint-m
e
rge-ff-
e
rror-
m
ess
a
g
e-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
M
e
rge branch 'ap/maint-merge-strategy
-
list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ham
a
no
Merge branch 'jc/pre
t
ty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge b
r
anch 'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch '
e
m
/commit-cla
i
m'
commit
|
commitdiff
|
tree
next