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
rebase -i: Retain user-edited commit messages after squash/fixup conflicts
2010-01-14
M
ichael Haggerty
rebase -i:
R
etain
user-edited co
m
mit messages
a
fte
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael Haggerty
t3404
:
Set up more of the test repo
i
n the "se
t
up"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
r
ebase -i: For fixup
com
m
ands
without
s
quashes, do
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Michael
Haggerty
rebase
-
i: Change
f
unction make_squash_message int
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
r
e
base -
i
: Extra
c
t
funct
i
on do_with_au
t
hor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
M
i
chael Hagger
t
y
rebase -i: Handle the author script a
l
l
in one place
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Mic
h
ael
Hagg
e
rty
reb
a
se -i: Extract a function "commit
_
message"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
M
icha
e
l Hagger
t
y
rebase -i: Simp
l
ify com
m
it counting for
gene
r
ate
d
com
m
it
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael Haggerty
rebase -i:
I
mprove consist
e
n
c
y o
f
commit count
i
n generat
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Michae
l
Hagg
e
rty
t3404: Test th
e
commit count
i
n
commit
messages gener
a
ted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael Haggert
y
r
e
base -i:
I
ntrod
u
ce
a constant
AME
N
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Michae
l
Ha
g
gerty
rebase -i: Intro
d
uce a
constant AU
T
HOR_SCRIPT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
M
i
chae
l
Haggerty
rebase -i:
D
ocument
how temporary
files are us
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
rebase
-
i:
U
se symbo
l
i
c constant $M
S
G consistently
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
M
i
chael Haggerty
rebase -i: Use "test -
n
" instead
o
f "test
! -z"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Michael H
a
g
g
erty
reba
s
e -i:
Inline expression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Mic
h
ael
Haggerty
r
ebase -
i
: Remove dead code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Michael
Hagge
r
ty
r
e
base -i:
M
ake the condition for an
"if" more tr
a
ns
p
arent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
M
ichael Haggerty
r
e
base-i: Ig
n
or
e
comments and blan
k
line
s
in p
e
ek_nex
t
_co
m
mand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Michael Haggerty
lib
-
re
b
ase:
A
llo
w
comment
s
a
n
d blank lines to be added
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Michael Ha
g
ge
r
ty
l
i
b-rebase: Provide clearer debugging info abo
u
t what
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-07
Michael Haggerty
Add
a
comm
a
nd "f
i
x
u
p" to rebas
e
--
i
nteractive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-07
Mich
a
el Ha
g
gerty
t3
4
04: Use test_commit
t
o
s
et
u
p
test
r
epository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C H
a
mano
Merge
b
ra
n
ch
'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Pre
p
are
f
or 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'uk/
m
aint-sh
o
rtlog-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C H
a
mano
Merge b
r
anch 'fc/ma
i
nt-f
o
rmat-patch-
p
at
h
spec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Mer
g
e br
a
n
c
h 'ap/
m
aint-merge-strate
g
y-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch
'jc/maint-am-keep' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C H
a
ma
n
o
Mer
g
e b
r
a
n
c
h
'rs/
w
o
rk-ar
o
und-
g
rep-opt
-
insani
t
y'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
Merge br
a
nch 'rj/ma
i
n
t
-cygwi
n
-
c
o
u
nt-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Haman
o
Me
r
ge branch
'
mm/maint-h
i
nt-failed-merge' into main
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Ha
m
an
o
Me
r
ge br
a
nch 'th/maint-re
m
ot
e
-update-he
l
p-s
t
r
i
ng'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ham
a
no
Merge
branc
h
'
r
j
/
m
aint-t9700'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge branch 'ls/maint
-
mailinfo-no-inbody' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h 'mo/ma
i
nt-crlf-d
o
c' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
aman
o
M
e
rge branch
'th/remote-u
s
age'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
H
amano
Merge branch
'pb/maint-use-custom-perl
'
int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mm
/
confi
g
-pathname-ti
l
de-e
x
pand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hama
n
o
Merge bran
c
h 'bc/grep
-
i-F' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge br
a
nch
'
jk/maint-break-rename-
r
e
d
uce-me
m
o
r
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch 'rj/ma
i
nt-s
i
mplify-cygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
ch 'rg/doc-w
o
rkflow'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merg
e
bran
c
h 'np/ma
i
n
t-
s
id
e
band
-
fa
v
or-st
a
tus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Na
r
e
b
ski
gitw
e
b
: Describe (poss
i
ble)
g
itweb
.
js
mi
n
i
f
icatio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Do
c
umenta
t
ion:
x
m
lto 0
.
0
.
1
8
doe
s
not know --stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
o
han Her
l
and
F
ix cr
a
sher on en
c
ountering
SHA1-like non-note in not
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brand
o
n Casey
t9001: use older G
e
topt::Long boole
a
n prefix
'
--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
B
r
a
ndo
n
Casey
t420
1
:
u
s
e
ISO
8
859-1
rather than
ISO-8859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio 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 Haman
o
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C Hama
n
o
Uncon
d
itiona
l
ly
s
et man
.
base
.
u
rl
.
f
o
r
.
relativ
e
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio 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
git-pull
.
s
h: Fix c
a
l
l
to
git
-
m
e
r
ge for
new co
m
mand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Merge branc
h
'
ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-02
J
u
ni
o
C Hamano
Prepa
r
e for
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
m
e
rge:
d
o no
t
add
s
t
a
ndard message when message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do
not
misid
e
n
ti
f
y "g
i
t
merge
f
oo HEA
D
" as an old-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
n
i
o C
H
amano
Upd
a
te draft release
n
otes
t
o 1
.
6
.
6
b
efore -
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
H
a
mano
Me
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch
'
j
c/
d
epr
e
cate-ol
d
-syntax-
f
rom-m
e
rge'
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
git-merge: a
d
e
prec
a
tion notic
e
of the
an
c
i
ent command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
am
a
no
Merge branc
h
'bw/remote
-
get-re
f
-states-f
i
x'
commit
|
commitdiff
|
tree
2009-12-01
Bert Wesarg
get_r
e
f_sta
t
e
s: st
r
dup ent
r
ies and free util
i
n stale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d
Aguila
r
help: Do
no
t
u
n
ne
c
es
s
arily 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
ber
Docum
e
ntation: Fix a f
e
w
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
mano
M
e
r
g
e
b
r
a
nch 'jn/gitweb-blame
'
commit
|
commitdiff
|
tree
2009-12-01
Jakub Nareb
s
ki
gitweb:
Add link
t
o other blam
e
implement
a
tion in blame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jaku
b
Narebski
g
itweb: Ma
k
e lin
k
ing to action
s
requi
r
in
g
J
avaScri
p
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Haman
o
Me
r
ge branch 'f
c
/main
t
-format-patch-
p
athspec
-
das
h
es'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
Merg
e
branch 'mm/m
a
i
nt-merge-ff
-
error-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
m
a
n
o
Merge branch
'
ap/m
a
i
nt-
m
erge-str
a
tegy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Merge
b
ranch 'jc
/
pret
t
y-lf'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Ha
m
ano
Me
r
g
e br
a
nch
'cc/b
i
sect-doc'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C H
a
mano
Mer
g
e branch 'em/commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
M
erge
b
ranch 'jc/ma
i
l
info-remove-bra
c
kets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge b
r
anch 'fc/send-email-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C
Ham
a
n
o
Mer
g
e branch 'uk/maint-s
h
o
r
t
l
o
g-encoding'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
Me
r
ge branch 'ns/sen
d
-e
m
a
i
l-no-chain
-
re
p
ly-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
am
a
n
o
M
erge branc
h
'jc/main
t
-am
-
k
eep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
M
e
rge bra
n
c
h
'
bw/diff-c
o
l
o
r-hunk-header'
commit
|
commitdiff
|
tree
2009-11-30
David Sori
a
P
a
rra
Docum
e
n
t
at
i
on: Do
c
ument --bra
n
ch
o
p
t
i
o
n in git clone
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
builtin-mer
g
e:
s
how
user-friendly error me
s
sage
s
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matth
i
eu Moy
m
erge-re
c
ursive: mak
e
th
e
error
-
m
e
ssage gene
r
atio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthe
w
Og
i
lvie
t/RE
A
DM
E
: Document GIT_TEST_INSTALLED and GI
T
_
T
E
ST_EXEC_PATH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthew Og
i
lvi
e
t3409 t4107
t
7
406
t9150: use da
s
hless commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Ave
r
y Pennar
u
n
bui
l
tin-merge
.
c: c
a
ll e
x
clude
_
cmds() co
r
r
ectly
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matth
e
w O
g
ilvie
t2
3
00: use documen
t
e
d
technique to i
n
voke
git-sh-setup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-29
Nanako
Shiraish
i
prepare send-email for smoot
h
er chan
g
e of --c
h
a
i
n-reply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Junio
C
Hama
n
o
Update
d
r
aft releas
e
notes to
1
.
6
.
6
b
ef
o
re merging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jonath
a
n Nied
e
r
Makefi
l
e:
d
o
n
ot clean
a
rm di
r
ectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Bert W
e
s
a
rg
G
i
ve
the hunk comment its
o
wn
c
o
lor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Felipe Contreras
send-
e
mail: aut
o
matic en
v
e
l
ope sender
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Junio
C
Hama
n
o
emit_l
i
ne(): don't emit an empt
y
<SET><RESET> followe
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
io C
Hamano
Remove
de
a
d code fro
m
"git
am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Jun
i
o C Hamano
Merge
b
ran
c
h
'
m
a
int'
commit
|
commitdiff
|
tree
2009-11-27
Johan
n
es
Sixt
Add a no
t
ice that only certain functions can pr
i
nt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Felipe C
o
nt
r
eras
format
-
patch: add
test for parsing
o
f "--"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
F
elipe C
o
nt
r
eras
f
orm
a
t-
p
atch: fix parsing o
f
"-
-
"
o
n the command lin
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Haman
o
bu
i
lti
n
-apply
.
c: pa
y
attention
t
o -p
<
n>
when determi
n
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next