| Commit message (Expand) | Author | Age | Files | Lines |
* | Revert recent "git merge <msg> HEAD <commit>..." deprecation | Junio C Hamano | 2009-12-08 | 1 | -6/+0 |
* | Merge branch 'maint' | Junio C Hamano | 2009-12-02 | 1 | -7/+9 |
|\ |
|
| * | merge: do not add standard message when message is given with -m option | Junio C Hamano | 2009-12-02 | 1 | -6/+8 |
| * | Do not misidentify "git merge foo HEAD" as an old-style invocation | Junio C Hamano | 2009-12-02 | 1 | -1/+1 |
* | | Merge branch 'jc/deprecate-old-syntax-from-merge' | Junio C Hamano | 2009-12-01 | 1 | -0/+6 |
|\ \ |
|
| * | | git-merge: a deprecation notice of the ancient command line syntax | Junio C Hamano | 2009-12-01 | 1 | -0/+6 |
* | | | Merge branch 'mm/maint-merge-ff-error-message-fix' | Junio C Hamano | 2009-11-30 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | builtin-merge: show user-friendly error messages for fast-forward too. | Matthieu Moy | 2009-11-29 | 1 | -0/+1 |
| |/ / |
|
* | | | Merge branch 'ap/maint-merge-strategy-list-fix' | Junio C Hamano | 2009-11-30 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | builtin-merge.c: call exclude_cmds() correctly. | Avery Pennarun | 2009-11-29 | 1 | -1/+1 |
| |/ / |
|
* | | | Merge branch 'fc/doc-fast-forward' | Junio C Hamano | 2009-11-15 | 1 | -6/+6 |
|\ \ \ |
|
| * | | | Use 'fast-forward' all over the place | Felipe Contreras | 2009-10-24 | 1 | -4/+4 |
| |/ / |
|
* | | | Merge branch 'maint' | Junio C Hamano | 2009-11-10 | 1 | -1/+0 |
|\ \ \
| | |/
| |/| |
|
| * | | merge: do not setup worktree twice | Jonathan Nieder | 2009-11-10 | 1 | -1/+0 |
| |/ |
|
* | | Merge branch 'bg/merge-ff-only' | Junio C Hamano | 2009-11-10 | 1 | -1/+10 |
|\ \ |
|
| * | | Teach 'git merge' and 'git pull' the option --ff-only | Björn Gustavsson | 2009-10-30 | 1 | -1/+10 |
| |/ |
|
* | | Refactor pretty_print_commit arguments into a struct | Thomas Rast | 2009-10-19 | 1 | -2/+5 |
|/ |
|
* | Merge branch 'jk/maint-merge-msg-fix' | Junio C Hamano | 2009-08-16 | 1 | -8/+12 |
|\ |
|
| * | merge: indicate remote tracking branches in merge message | Jeff King | 2009-08-09 | 1 | -0/+5 |
| * | merge: fix incorrect merge message for ambiguous tag/branch | Jeff King | 2009-08-09 | 1 | -8/+7 |
* | | Merge branch 'js/run-command-updates' | Junio C Hamano | 2009-08-10 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | run_command: return exit code as positive value | Johannes Sixt | 2009-07-05 | 1 | -1/+1 |
* | | Merge branch 'tr/die_errno' | Junio C Hamano | 2009-07-06 | 1 | -13/+16 |
|\ \
| |/
|/| |
|
| * | Use die_errno() instead of die() when checking syscalls | Thomas Rast | 2009-06-27 | 1 | -9/+12 |
| * | Convert existing die(..., strerror(errno)) to die_errno() | Thomas Rast | 2009-06-27 | 1 | -4/+4 |
* | | Fix various sparse warnings in the git source code | Linus Torvalds | 2009-06-20 | 1 | -2/+2 |
* | | Merge branch 'cb/maint-no-double-merge' | Junio C Hamano | 2009-06-13 | 1 | -1/+4 |
|\ \
| |/
|/| |
|
| * | refuse to merge during a merge | Clemens Buchacher | 2009-06-01 | 1 | -1/+4 |
* | | parse-opts: prepare for OPT_FILENAME | Stephen Boyd | 2009-05-25 | 1 | -2/+2 |
|/ |
|
* | Merge branch 'maint' | Junio C Hamano | 2009-04-28 | 1 | -1/+1 |
|\ |
|
| * | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-28 | 1 | -1/+1 |
| |\ |
|
| | * | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-28 | 1 | -1/+1 |
| | |\ |
|
| | | * | builtin-merge: fix a typo in an error message | Allan Caffee | 2009-04-27 | 1 | -1/+1 |
* | | | | strbuf_branchname(): a wrapper for branch name shorthands | Junio C Hamano | 2009-03-22 | 1 | -3/+2 |
* | | | | Rename interpret/substitute nth_last_branch functions | Junio C Hamano | 2009-03-22 | 1 | -1/+1 |
* | | | | Turn the flags in struct dir_struct into a single variable | Johannes Schindelin | 2009-02-18 | 1 | -1/+1 |
|/ / / |
|
* | | | Teach @{-1} to git merge | Junio C Hamano | 2009-02-13 | 1 | -3/+12 |
* | | | Replace deprecated dashed git commands in usage | Alexander Potashev | 2009-02-04 | 1 | -2/+2 |
* | | | Move run_hook() from builtin-commit.c into run-command.c (libgit) | Stephan Beyer | 2009-01-17 | 1 | -30/+1 |
|/ / |
|
* | | Make some of fwrite/fclose/write/close failures visible | Alex Riesen | 2008-12-04 | 1 | -2/+4 |
* | | Teach/Fix pull/fetch -q/-v options | Tuncer Ayaz | 2008-11-14 | 1 | -7/+14 |
* | | Merge branch 'mv/merge-noff' | Junio C Hamano | 2008-10-19 | 1 | -0/+10 |
|\ \ |
|
| * | | builtin-commit: use reduce_heads() only when appropriate | Miklos Vajna | 2008-10-03 | 1 | -0/+10 |
* | | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer | Brandon Casey | 2008-10-12 | 1 | -18/+9 |
* | | | Merge branch 'mv/merge-refresh' | Shawn O. Pearce | 2008-10-09 | 1 | -0/+10 |
|\ \ \ |
|
| * | | | builtin-merge: refresh the index before calling a strategy | Miklos Vajna | 2008-10-03 | 1 | -0/+10 |
| |/ / |
|
* | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-09 | 1 | -2/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | builtin-merge.c: allocate correct amount of memory | Brandon Casey | 2008-10-09 | 1 | -2/+2 |
* | | | Replace xmalloc/memset(0) pairs with xcalloc | Brandon Casey | 2008-10-08 | 1 | -2/+1 |
| |/
|/| |
|
* | | Merge branch 'mv/merge-recursive' | Shawn O. Pearce | 2008-09-25 | 1 | -29/+64 |
|\ \ |
|