repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge script: tweak unmerged files message to match builtin
2010-08-18
Jonathan Nieder
merge sc
r
ipt:
tweak u
n
m
erged files mes
s
ag
e
to m
a
tch
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge
s
cript: --squash, --ff from unborn br
a
nch
a
r
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
fmt-merge-msg
-m to overrid
e
m
e
rge title
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
i
e
der
merg
e
-base --i
n
dependent
t
o print
r
educed parent list
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merg
e
-base --octopus
to
m
i
m
i
c show-branch --mer
g
e-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
D
ocumentation: add
a
SEE
ALSO section f
o
r merge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
t6200 (
f
mt-merge-msg): style nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
t6010 (merge-bas
e
):
m
odernize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t
7600 (me
r
ge): test mer
g
e from branch
y
et to be born
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Ni
e
d
e
r
t7
6
00 (merge): ch
e
ck r
e
flo
g
entry
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (mer
g
e): d
o
no
t
la
u
n
c
h gitk for
-
-debug
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge):
modernize
style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
merge: do no
t
mistake (ancestor of) tag for branc
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jon
a
than N
i
eder
t/README:
c
orrec
t
an excepti
o
n
when b
r
eaking a &&
c
hain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
J
o
nathan Nieder
Add a sampl
e
user
for
t
he svnd
u
mp
librar
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jon
a
than Nieder
D
o
c
umen
t
atio
n
:
a
dd submodu
l
e
.
* to the b
i
g con
f
igur
a
tion
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
N
ieder
gitm
o
d
u
les
.
5: url ca
n
be a relative path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Niede
r
git -
-
paginate: pa
g
inate
external comm
a
nds
aga
i
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t3000 (
l
s
-files
-
o): m
o
de
r
nize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan Ni
e
der
t911
8
(git-svn): prevent early failure from taking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
J
o
nathan N
i
ed
e
r
t/README: document more test he
l
pers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jona
t
han
Nieder
rever
t
: do not rebuild argv on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
J
o
n
athan Niede
r
tests:
l
o
c
al config file
s
h
ou
l
d
b
e hono
r
ed from su
b
dir
s
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t7006: test
pager configuratio
n
for sever
a
l git co
m
m
ands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t7006
(pager): introduce
helper for par
a
meterized
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jo
n
athan N
i
ed
e
r
t
3
508 (cherr
y
-pick): futureproof against unme
r
ged files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonat
h
an Nieder
git-svn: strip
off leadin
g
sla
s
hes
o
n --trunk argument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jon
a
t
h
an Ni
e
der
add-interactive: Cla
r
ify
“remai
n
i
n
g hunks
in the f
i
le”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan
Nieder
grep:
r
efactor grep_ob
j
ects loop into its own
func
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonat
h
an
Ni
e
der
Docume
n
t
ation/checkout: clarify de
s
cripti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
rebase -i -p: document shortcomings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan
N
i
eder
DW
I
M
'
git
s
how -
5
' to
'g
i
t sh
o
w --
d
o-walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
g
i
tignore
.
5: Clarify matching rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
o
nathan Nieder
r
ebase: improve er
r
or m
e
ssage when upstream argument
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
onath
a
n Nieder
Docu
m
ent
a
tion/ch
e
ckout: cla
r
i
fy d
e
scri
p
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nieder
fsck: fix
b
ogus commit header chec
k
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
J
o
nath
a
n Nieder
Add git remote set
-
branc
h
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Niede
r
post-r
e
c
eive-ema
i
l: document
c
om
m
and
-
line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nieder
git svn: av
o
id uninitialized
var in 're
s
et'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Niede
r
Makefile: l
e
t header d
e
pendency checker override
C
OMP
U
T
E
_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than
Nieder
Makefile: fix h
e
a
d
er de
p
endenc
y
chec
k
er
to allow NO_CUR
L
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Nieder
Documen
t
ation
/
notes: nitp
i
cks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
D
o
cu
m
entatio
n
/notes:
c
l
ean up des
c
riptio
n
o
f
rewriting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
eder
Documentati
o
n/notes: si
m
plify treatment of
d
efault
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation
/
log:
ad
d
a CONFIGURATION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
N
i
eder
Docu
m
e
ntati
o
n/notes:
s
implify treat
m
en
t
of
def
a
ult
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
Documentation/notes: add configur
a
tion
section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an Nieder
Docum
e
ntation/note
s
: describe c
o
n
t
ent of no
t
es bl
o
bs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than Nieder
Documentati
o
n/notes: document format of note
s
tree
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jona
t
ha
n
Nieder
cher
r
y
-pick:
do not dump core when iconv f
a
ils
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Niede
r
pr
e
tty: initialize n
e
w cmt_fmt_map to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jona
t
h
a
n Nieder
ada
p
t request-pull tests fo
r
new pu
l
l reques
t
for
m
at
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jo
n
athan Niede
r
test-
l
ib: some shells do no
t
let $? propagate into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
shortlog: Document and test --
f
ormat opt
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
Nieder
t
4201
(
shortlog): Test output forma
t
with mul
t
iple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t
4201 (shortlog): gu
a
rd setup w
i
th test_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
N
iede
r
D
o
cumentation/sh
o
rt
l
og: scripted users
s
hould
n
ot r
e
l
y
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than N
i
e
d
e
r
c
o
mmit --amen
d
: cope with missing display name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
ha
n
Nieder
te
s
t-lib: L
e
t tests speci
f
y com
m
ands to be run at end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
fsck: check ident lines in commit objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonath
a
n Nieder
request-pull: protect against OPTIONS_
K
E
E
P
D
A
SHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
o
nathan
Nieder
tests for r
e
q
uest-p
u
ll
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Nieder
Docume
n
tatio
n
/Makefile: fix interru
p
ted buil
d
s o
f
u
s
er
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Niede
r
f
ix "bu
n
dle --stdin" seg
f
ault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Niede
r
t5704
(
bund
l
e): add tests f
o
r bundle --stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonatha
n
N
i
eder
t
a
g -v: u
s
e
R
UN
_
G
I
T_CMD to
run ve
r
ify
-
tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonath
a
n Nieder
Document new "already-m
e
rg
e
d"
ru
l
e
for branc
h
-d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonath
a
n Niede
r
Add
.
d
e
p
end directori
e
s to
.
gitign
o
re
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonat
h
a
n
N
ieder
t7
0
06:
g
uard clean
u
p with test
_
expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan Nieder
t5800: testgit h
e
l
p
er re
q
uires
Python supp
o
r
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jona
t
han Nied
e
r
t
7
400: clarify s
u
bmodule update tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jona
t
han Nieder
t7400: clarify 'subm
o
d
ule add' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jona
t
h
an Nieder
t7
4
00
:
split
s
et
u
p int
o
m
ulti
p
l
e
test
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nieder
Teach mailinfo %< as an alternative scissors m
a
r
k
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
J
o
nat
h
an Nieder
Makefile: futur
e
-proof Cygwin version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
mer
g
e-r
e
cu
r
sive: add a lab
e
l for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
cherry-pick,
r
e
ve
r
t: add a lab
e
l
for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
r
e
v
e
rt:
cl
a
r
i
fy label on conflict hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
compat: add mempcp
y
()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than N
i
eder
checko
u
t
-
m --c
o
nflict=diff3: add
a label for ance
s
t
o
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_trees(): add ancest
o
r
l
ab
e
l parameter for
d
iff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
N
ied
e
r
mer
g
e_f
i
le
(
): add
com
m
ent explaining behavior wrt confli
c
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
checkout -
-
confl
i
ct=
d
iff3: add a
label f
o
r ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
ll_merge()
:
add ancest
o
r
l
abel
parame
t
er for d
i
ff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-
f
ile -
-
diff3:
add
a
label for ancesto
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
x
dl_merge():
m
o
v
e file1
and
f
i
l
e
2 labels to x
m
par
a
m
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
xdl_m
e
rge()
:
ad
d
optional ancestor
l
abel t
o
diff3-style
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Niede
r
tests: document
c
herry-pick behavior in face o
f
conflicts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan Nied
e
r
tests: document f
o
rmat of confl
i
c
t
s from checko
u
t -m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han
N
ieder
revert:
f
ix tin
y
memory leak in cherry-pick --ff
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan Nieder
Make
f
ile: Fix occasional GIT-CFLAG
S
br
e
akage
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan Nieder
M
ak
e
file: Fix CDPATH problem
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
ede
r
gitk: Don't clobbe
r
"R
e
member this
view"
s
et
t
ing
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonath
a
n Nieder
gitk:
A
d
d
c
omments
t
o ex
p
lain
e
ncode_v
i
e
w_o
p
ts and
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
J
onathan Nieder
Makefi
l
e: clarif
y
d
efinit
i
on of TES
T
_
OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan
N
i
eder
a
m
: remo
v
e rebase-a
p
ply directory before gc
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Nieder
tests: Fix race condition in
t
7
006-pa
g
er
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-21
Jonatha
n
Nied
e
r
t
7
006-pager: if
stdout is
not
a
t
ermi
n
al, make a new one
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
J
onathan Niede
r
tests: Add tests for automatic use of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonat
h
an Nieder
am: Fix launchin
g
of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next