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
Documentation: reset: add some missing tables
2010-01-05
C
h
ristian Coude
r
Documentation:
reset: add som
e
mi
s
sin
g
t
a
bles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Ham
a
no
Fix
bit ass
i
g
nment for CE_CONFLICTE
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C H
a
mano
"reset --merge
"
: fix un
m
erged case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-03
Stephan Be
y
e
r
r
ese
t
: use "
u
npack_trees()" directly instead
of
"
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Ch
r
istian Couder
res
e
t
:
add a f
e
w
t
es
t
s for "git
r
es
e
t --merge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Ch
r
istian Couder
D
o
cument
a
t
ion: r
e
set: ad
d
some tables t
o
describe the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Christian Couder
re
s
et: impro
v
e
m
ixed res
e
t
error m
e
ssage wh
e
n i
n
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Ham
a
no
G
it
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio
C
H
am
a
no
Mer
g
e b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-22
David Re
i
s
s
Prevent
git
bl
a
m
e from segfau
l
t
i
n
g on a missing author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
G
i
t
1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
J
u
nio C Hamano
M
erge branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-20
Björn Gustavsson
rebase -i: abort cleanly if the editor fails to lau
n
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephe
n
B
o
yd
tec
h
ni
c
al-docs
:
docum
e
nt hash API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Bo
y
d
api-st
r
b
u
f
.
txt: fix typos and document lau
n
ch_ed
i
tor()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
unio
C
H
aman
o
G
i
t
1
.
6
.
6
-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
M
e
r
g
e
br
a
nch
'mai
n
t' to
s
ync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C Hamano
Git
1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C
H
amano
wor
k
tree: do
n
't segfaul
t
w
i
th an abs
o
lu
t
e pathsp
e
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff
K
i
ng
ig
n
ore unknown c
o
lor c
o
nfiguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Johannes
S
ixt
h
e
lp
.
autocorrect: do not run a
c
o
m
m
a
nd if the comman
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
N
a
nako Shirai
s
hi
Illustrate "filte
r
" att
r
ibute with an example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björn Gu
s
tavsson
bash: Su
p
port new 'gi
t
fetch'
o
p
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Release Notes
f
o
r 1
.
6
.
6 to rem
o
ve old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Ju
n
i
o 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 Hamano
G
i
t 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Fix archive format
wi
t
h
-- o
n
the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remove post-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ham
a
no
G
i
t 1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C
H
am
a
no
M
erge gi
t
://git
.
kerne
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Update draft relea
s
e notes to 1
.
6
.
6 before -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Mer
g
e br
a
nch 'mm/maint-me
r
ge
-
ff-error-messag
e
-fi
x
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
i
o C Haman
o
Merge
branch 'jn/maint-pul
l
-
rebase-
e
rror-message
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Merge
branch 'jk/m
a
int-a
d
d-p-dele
t
e-fix' into main
t
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge
git://gi
t
.
bogomips
.
o
r
g/git-
s
vn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Revert recent "g
i
t merge <msg> HEAD <commit>
.
.
.
" deprecatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Jeff K
i
ng
add-i
n
teracti
v
e:
f
ix deletion of non-empty fi
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
S
Z
E
D
E
R
Gábor
bash
:
update '
g
it commit' compl
e
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C Haman
o
Sync with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
unio C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torvalds
Fi
x
d
i
f
f
-
B
/--dirstat miscounting of n
e
wly added c
o
n
t
e
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: i
m
prove
w
orktree safety valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
Docume
n
tatio
n
: Av
o
id use of
xml
t
o
-
-
stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
archive: clar
i
fy description
of path pa
r
ameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
J
e
ff King
rerere: don't segfault on failure to
o
pe
n
rr-cac
h
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o
C
Hamano
Prepa
r
e
f
or 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branc
h
'
uk/maint-shor
t
lo
g
-enc
o
din
g
'
int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch
'fc/main
t
-f
o
rmat-p
a
tch-pa
t
hs
p
ec-d
a
s
hes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch 'ap/maint-merge-
s
trategy-l
i
st-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch
'
j
c
/maint-am-keep' into
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
M
e
r
ge branch 'rs/w
o
rk-around-gr
e
p-opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
mano
Merge branch 'rj/maint-cygw
i
n-count-
o
bjects' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
M
e
rge br
a
n
c
h
'mm/maint-hi
n
t-failed-
m
erge' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C H
a
mano
Merge branc
h
'th/maint-
r
em
o
t
e-u
p
date
-
h
elp
-
string'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge bran
c
h 'rj/maint-t9
7
00' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge branch 'ls/maint-mailinfo-no-inbo
d
y' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'm
o
/maint-crlf-doc'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merg
e
branch
'
th/r
e
m
o
t
e
-
u
sage' i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C H
a
mano
Merge
b
r
anch
'
pb/maint-
u
s
e
-
custom-
p
erl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Mer
g
e b
r
anch 'mm/config-
p
athname
-
tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
M
e
rge bran
c
h 'bc/grep-i-F
'
i
nto
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
M
erge
branch
'
j
k/main
t
-
b
re
a
k-rename-
r
edu
c
e-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch
'
rj/maint-
s
i
m
plify-cygwin-ma
k
e
file' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Mer
g
e branch 'rg/doc-workflow' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch 'np/maint-sideband-fa
v
or-st
a
tus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
a
k
u
b Narebski
gitweb: Describe (possible) gitweb
.
js minificati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentation: xmlto 0
.
0
.
18 does not know
--str
i
n
gparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix cra
s
her o
n
encounte
r
ing SHA1-l
i
ke non-
n
ote
in notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t
9
0
0
1: use older
Getopt::Long
boolean prefix '--no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t4201
:
use ISO
8
859-1 rat
h
er tha
n
ISO-8859
-
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ja
n
K
r
üger
pull:
c
larify
a
dvice
for t
h
e unconfigu
r
ed
error ca
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge 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
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Uncondition
a
lly
set man
.
base
.
url
.
for
.
relative
.
l
i
n
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Docume
n
tati
o
n
/
Makefi
l
e: allow man
.
base
.
url
.
f
o
r
.
relativ
e
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
ano
G
it
1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
von
Brand
g
i
t-pul
l
.
sh: Fix call to git-merge for
n
e
w
c
o
mmand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
M
e
rge
b
r
a
nch
'
maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ham
a
no
Prepare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C
Hamano
merge: do not add s
t
andard message
w
hen message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
Do n
o
t misidentify "git m
e
r
ge f
o
o HE
A
D"
a
s an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
H
a
mano
U
pdate draf
t
release note
s
to 1
.
6
.
6
befo
r
e -
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge
bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Ham
a
no
Mer
g
e branch
'
jc/deprecate-old-s
y
ntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
git-merge: a de
p
recation
n
o
t
i
ce of the anc
i
ent command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
Merge
branch
'
bw/re
m
ote-get-
r
ef-states-fix
'
commit
|
commitdiff
|
tree
2009-12-01
Bert W
e
sarg
get_ref_states: strdu
p
entries and free util
in s
t
ale
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
D
avid
A
gu
i
l
ar
help: Do not unneces
s
arily look for a repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Mich
a
e
l
J
G
ruber
D
o
cumentati
o
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
Junio C H
a
m
a
no
Me
r
ge branch
'jn/git
w
eb-
b
la
m
e
'
commit
|
commitdiff
|
tree
2009-12-01
Jakub Nar
e
bs
k
i
gitweb: Add
link t
o
o
t
her blame
i
m
ple
m
entation in blame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jakub
N
arebski
gitwe
b
: Make lin
k
ing to actions requiring J
a
v
a
Scri
p
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Merge branch 'fc
/
mai
n
t-format-pat
c
h-path
s
pec
-
dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Me
r
ge branch 'mm/mai
n
t-merge-ff-
e
rror-m
e
s
sage-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
b
ra
n
c
h
'ap/mai
n
t-merge-strategy-l
i
s
t-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bra
n
c
h 'j
c
/pretty-lf'
commit
|
commitdiff
|
tree
next