Commit message (Expand) | Author | Age | |
---|---|---|---|
* | notes.h: declare bit field as unsigned to silence compiler complaints | Brandon Casey | 2010-04-06 |
* | Git 1.7.1-rc0v1.7.1-rc0 | Junio C Hamano | 2010-04-06 |
* | Merge branch 'da/maint-python-startup' | Junio C Hamano | 2010-04-06 |
|\ | |||
| * | Makefile: Remove usage of deprecated Python "has_key" method | David Aguilar | 2010-03-28 |
* | | Merge branch 'ic/bash-completion-rpm' | Junio C Hamano | 2010-04-06 |
|\ \ | |||
| * | | RPM spec: include bash completion support | Ian Ward Comfort | 2010-03-29 |
* | | | Merge branch 'sb/fmt-merge-msg' | Junio C Hamano | 2010-04-06 |
|\ \ \ | |||
| * | | | fmt-merge-msg: hide summary option | Stephen Boyd | 2010-03-24 |
| * | | | fmt-merge-msg: remove custom string_list implementation | Stephen Boyd | 2010-03-24 |
| * | | | string-list: add unsorted_string_list_lookup() | Stephen Boyd | 2010-03-24 |
| * | | | fmt-merge-msg: use pretty.c routines | Stephen Boyd | 2010-03-24 |
| * | | | t6200: test fmt-merge-msg more | Stephen Boyd | 2010-03-24 |
| * | | | t6200: modernize with test_tick | Stephen Boyd | 2010-03-24 |
| * | | | fmt-merge-msg: be quiet if nothing to merge | Stephen Boyd | 2010-03-24 |
* | | | | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-04-06 |
|\ \ \ \ | |||
| * | | | | diff --check: honor conflict-marker-size attribute | Junio C Hamano | 2010-03-24 |
* | | | | | Merge branch 'ef/maint-empty-commit-log' | Junio C Hamano | 2010-04-06 |
|\ \ \ \ \ | |||
| * | | | | | rev-list: fix --pretty=oneline with empty message | Erik Faye-Lund | 2010-03-21 |
* | | | | | | Merge branch 'sg/bash-completion' | Junio C Hamano | 2010-04-06 |
|\ \ \ \ \ \ | |||
| * | | | | | | bash: completion for gitk aliases | SZEDER Gábor | 2010-02-24 |
| * | | | | | | bash: support user-supplied completion scripts for aliases | SZEDER Gábor | 2010-02-24 |
| * | | | | | | bash: support user-supplied completion scripts for user's git commands | SZEDER Gábor | 2010-02-24 |
| * | | | | | | bash: improve aliased command recognition | SZEDER Gábor | 2010-02-24 |
* | | | | | | | Revert "Link against libiconv on IRIX" | Junio C Hamano | 2010-04-05 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-04-04 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | pack-protocol.txt: fix pkt-line lengths | Tay Ray Chuan | 2010-04-04 |
| * | | | | | | | pack-protocol.txt: fix spelling | Tay Ray Chuan | 2010-04-04 |
* | | | | | | | | Merge branch 'mb/rebase-i-no-ff' | Junio C Hamano | 2010-04-03 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Teach rebase the --no-ff option. | Marc Branchaud | 2010-03-24 |
* | | | | | | | | | Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' | Junio C Hamano | 2010-04-03 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | http-backend: Don't infinite loop during die() | Shawn O. Pearce | 2010-03-24 |
* | | | | | | | | | | Merge branch 'rr/imap-send-unconfuse-from-line' | Junio C Hamano | 2010-04-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | imap-send: Remove limitation on message body | Ramkumar Ramachandra | 2010-03-24 |
| |/ / / / / / / / / | |||
* | | | | | | | | | | Merge branch 'mg/use-default-abbrev-length-in-rev-list' | Junio C Hamano | 2010-04-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | rev-list: use default abbrev length when abbrev-commit is in effect | Michael J Gruber | 2010-03-24 |
| |/ / / / / / / / / | |||
* | | | | | | | | | | Merge branch 'mg/maint-send-email-lazy-editor' | Junio C Hamano | 2010-04-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | send-email: lazily assign editor variable | Michael J Gruber | 2010-03-25 |
* | | | | | | | | | | | Merge branch 'rb/maint-python-path' | Junio C Hamano | 2010-04-03 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Correct references to /usr/bin/python which does not exist on FreeBSD | R. Tyler Ballance | 2010-03-24 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'jn/merge-diff3-label' | Junio C Hamano | 2010-04-03 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | merge-recursive: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | | cherry-pick, revert: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | | revert: clarify label on conflict hunks | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | | compat: add mempcpy() | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | | checkout -m --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | | merge_trees(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | | merge_file(): add comment explaining behavior wrt conflict style | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | | checkout --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 |
| * | | | | | | | | | | | merge-file --diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 |