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
merge: Make '--log' an integer option for number of shortlog entries
2010-09-09
Ramkumar Ramacha
n
dra
merge: Make
'
--log' an integer o
p
tion for number of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramacha
n
dra
fmt_merg
e
_ms
g
: Chang
e
f
m
t_merge_
m
s
g
API to
accept shortlo
g
_le
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge
script
:
l
e
arn
-
-[no-]
r
erere-a
u
t
o
up
d
ate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
me
r
ge scrip
t
: notice
@
{
-1} shortha
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
me
r
ge s
c
ri
p
t
:
h
an
d
le --n
o
-f
f
--no-commi
t
correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
mer
g
e script
:
-
-ff-only to disallow
true merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge sc
r
ipt: handle many-way octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
merge sc
r
ipt: han
d
le -m --log
corre
c
t
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nied
e
r
m
e
rge script: forbid merge -s i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nied
e
r
merge script: allow
custom strategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merge
scrip
t
: merg
e
-X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge scr
i
p
t: impr
o
v
e
log messag
e
subject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
mer
g
e script:
refu
s
e
t
o
merge during
m
e
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an
N
ieder
merge script: t
w
e
ak unme
r
ged files m
e
ssage to m
a
tch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nie
d
er
m
e
r
ge script: --squash, --ff f
r
om unborn branch
are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
Nieder
f
mt-merge-msg -m
t
o
o
verr
i
de merge title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
merge-base --indep
e
n
dent to
print reduced parent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Ni
e
de
r
merge-base --oct
o
pus to mimic sho
w
-branch --merge-b
a
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
Docum
e
ntati
o
n: add a SEE ALSO
sec
t
ion
f
or
merge-ba
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Ni
e
der
t6200 (fmt
-
merge-msg): styl
e
nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
an
N
ieder
t6010 (mer
g
e-base): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
t7600 (merge): te
s
t mer
g
e from branc
h
yet to be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
ede
r
t7600 (mer
g
e): check
r
ef
l
o
g
entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (
m
erge):
d
o
n
ot launch gitk for --de
b
ug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7
6
00 (merge)
:
m
o
der
n
ize s
t
y
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Ni
e
d
er
merg
e
: do not mistake (an
c
e
stor of) tag for
branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C H
a
mano
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
u
nio C H
a
mano
tests: correct "does ref
l
og exist?" tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t/: work around one-shot
v
aria
b
le assign
m
ent wit
h
test_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/
R
EADME: correc
t
a
n
exceptio
n
wh
e
n breaki
n
g
a
&&
chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Br
a
ndon Casey
t
/
{t
5
5
41
,
lib-
h
ttpd}: replace prob
l
ematic '!()'
n
otation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/t3700: con
v
e
r
t two
u
s
es of nega
t
ion operator '!
'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
J
u
nio C
H
amano
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon C
a
sey
t/R
E
ADME: clarify test_mu
s
t_fail de
s
cription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
Check size of
p
ath bu
f
fer
before
writing
i
n
t
o
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Juni
o
C Hamano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-07-19
Ral
f
Thielow
up
d
a
t
e
-server-info: Sh
o
rten read_pack_i
n
fo
_
file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
Arnfj
ö
r
ð
Bjarmason
git a
d
d: Add --ignore-missing
t
o SYNOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bj
a
rmason
g
i
t submod
u
le add: Re
m
ove old do
c
s about
implicit -
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens
Leh
m
a
n
n
gi
t
submodule add: Requ
i
re the
n
ew --force
option to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
io
C
Hamano
Merge
b
ranch 'j
l
/add-n-i
g
nore-missin
g
'
commit
|
commitdiff
|
tree
2010-07-19
David
A
guila
r
Documentation
:
Explain g
i
t
-
mergetool's
u
se of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio
C
Hamano
Merge bra
n
ch
'jc/dif
f
-
merge-b
a
s
e-m
u
lti'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
O
n
ly run aggre
g
ate-results o
v
e
r
a
c
tual counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan N
i
e
der
Add a sample
user for
the svndump library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
H
aman
o
d
i
f
f A
.
.
.
B: do not
l
i
mit the sy
n
tax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C H
a
man
o
Merge
b
r
a
nc
h
'jn/pagi
n
ate-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
io
C
H
a
mano
M
erge
b
ranch 'w
p
/
m
e
r
ge
-
tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
an
o
Mer
g
e
branch
'
js/mer
g
e
-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o
C Hamano
Merge b
r
anch 'jc/diff-mer
g
e-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'ns/mer
g
e-recursive-
u
p
t
o
date'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Mer
g
e b
r
anch 'jn/test
s
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge br
a
nch 'eb/do
c
-log-ma
n
page'
commit
|
commitdiff
|
tree
2010-07-15
J
un
i
o C Haman
o
Merge branch 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
bran
c
h '
m
g/revisio
n
-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge branch
'jk/maint-s
t
atus-k
e
ep-index-t
i
mestamp
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio
C
Hamano
Mer
g
e bran
c
h '
j
c
/
reba
s
e-i-commit-m
s
g-fix
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge br
a
nch '
a
b/subm
o
dule-
a
dd-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merge branch 'bc/maint-
m
akefile-fixes
'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C
H
am
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonatha
n
Niede
r
Documentati
o
n:
a
d
d s
u
b
m
odule
.
* to th
e
big config
u
ration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan N
i
e
d
er
gitmodules
.
5: url
ca
n
b
e a relative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Ku
m
ar Sun
k
a
r
a
gitweb:
f
i
x
esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan
N
iede
r
git --paginate: paginat
e
e
xternal commands agai
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffi
a
n
MERGE_RR is in
.
g
it, not
.
git/rr-cach
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Wi
l
l Palmer
merg
e
-tree: fix where two branches s
h
are no changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Wil
l
P
a
lmer
add basic tests for
m
e
rge
-
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio
C Hamano
Git 1
.
7
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Haman
o
Merge branch 'jc/read-tree-cache
-
t
ree-fix
'
commit
|
commitdiff
|
tree
2010-07-14
Raj
a
R
Harinath
Use dev_
t
fo
r
device id (st_de
v
) from st
a
t in setup
_
git_dire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
dif
f
A
.
.
.
B: give one possib
l
e di
f
f w
h
en there are more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
git fet
c
h documentation: descri
b
e shor
t
'-p'
synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
M
i
k
l
os Vajna
format-patch
:
document the fo
r
mat
.
t
o configura
t
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehmann
g
i
t
add:
Add th
e
"--ignore
-
mi
s
sing" op
t
ion for t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J G
r
ube
r
test-li
b
: TAP
c
o
m
pliance for sk
i
pping t
e
sts
o
n request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J
G
r
u
ber
test-
l
i
b
: simp
l
ify GIT_SKIP_TESTS loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
J
u
ni
o
C Ham
a
no
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t
3
000
(ls-files -o): moder
n
ize sty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fre
d
rik
Skolmli
Do
c
umentation: Spellin
g
f
ix in p
r
otocol
-
c
a
pabilities
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas S
e
b
recht
merge-r
e
cursive: use "up-
t
o-date" i
n
s
tead
of "uptodate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
checkout: accord d
o
cumenta
t
ion to what gi
t
does
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Johanne
s
Sixt
t0005: work ar
o
und strange $? in ksh
when program terminat
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Juni
o
C
Hamano
Merge remote br
a
nch 'ko/
m
aste
r
' into jc
/
read-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
d
i
ff
.
c: fix
a graph o
u
tput bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjörð Bjarmas
o
n
tests: Use skip_all=*
t
o skip tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio
C Hamano
Fix "read-tree -m A B" prim
i
ng
the
c
a
che-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
i
Ba
r
zi
l
ay
Reorganize `git-log' man page
to clarify
comm
o
n diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
grep -O: D
o
not pass color sequences as filenames to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
u
n
io C Ha
m
a
no
Git
1
.
7
.
2-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C Hama
n
o
Mer
g
e branch
'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio C
Hamano
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-07
J
u
n
i
o C H
a
mano
back
m
erge a few mo
r
e fixes
t
o
1
.
7
.
1
.
X se
r
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ham
a
no
Merge branch 'maint-1
.
6
.
4' into
maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Klei
n
e-Kö
n
ig
r
e
v-p
a
rse: fix --parse-opt --keep-d
a
shd
a
sh --stop-at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
i
o
C Hamano
M
erge branch 'mg/
d
oc-rev-parse-treepath-syn
t
ax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ham
a
no
Merg
e
bran
c
h
'
tr/rec
e
ive-pack-aliased-up
d
ate-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
P
i
err
e
Habo
u
zit
fix git br
a
nc
h
-m in prese
n
ce of cross d
e
vices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
B
r
an
d
on Casey
t/
t
0006: s
p
ecif
y
timezone as
E
ST5 n
o
t EST t
o
comply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Hamano
do not write out ind
e
x
when
s
t
a
tus does not
h
ave to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next